svn: 1522

src/botnet.c

@@ -566,7 +566,7 @@ void tell_bottree(int idx)
     return;
   }
 
-  char s[161] = "", work[1024] = "", *color = NULL;
+  char s[161] = "", work[1024] = "", *color_str = NULL;
   tand_t *last[20] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
   tand_t *thisbot = NULL, *bot = NULL, *bot2 = NULL;
@@ -583,17 +583,18 @@ void tell_bottree(int idx)
       i += strlen(bot->bot);
     }
 
-  if (bot_hublevel(conf.bot->u) < 999))
-    color = YELLOW(idx);
+  if (bot_hublevel(conf.bot->u) < 999)
+    color_str = (char *) YELLOW(idx);
   if (localhub)
-    color = RED(idx);
+    color_str = (char *) RED(idx);
   else
-    color = NULL;
+    color_str = (char *) NULL;
 
   if (s[0])
     dprintf(idx, "(%s %s)\n", BOT_NOTRACEINFO, s);
-  dprintf(idx, "%s%s%s (%s %li)\n", color ? color : "", 
-                                    color ? COLOR_END(idx) : "",
+  dprintf(idx, "%s%s%s (%s %li)\n", color_str ? color_str : "", 
+                                    conf.bot->nick,
+                                    color_str ? COLOR_END(idx) : "",
                                     egg_version, buildts);
 
   thisbot = (tand_t *) 1;
@@ -628,19 +629,19 @@ void tell_bottree(int idx)
           botu = get_user_by_handle(userlist, bot->bot);
        
           if (botu && bot_hublevel(botu) < 999)
-            color = YELLOW(idx);
+            color_str = (char *) YELLOW(idx);
           if (botu && bot->localhub)
-            color = RED(idx);
+            color_str = (char *) RED(idx);
           else
-            color = NULL;
+            color_str = (char *) NULL;
 
           if (bot->share)
             i = sprintf(s, "%c", bot->share);
           else
             i = sprintf(s, "-");
-          i = sprintf(s + 1, "%s%s%s (%s %li)", color ? color : "",
+          i = sprintf(s + 1, "%s%s%s (%s %li)", color_str ? color_str : "",
                                                 bot->bot,
-                                                color ? COLOR_END(idx) : "",
+                                                color_str ? COLOR_END(idx) : "",
                                                 bot->version, bot->buildts);
 	} else
 	  bot = bot->next;
@@ -673,20 +674,20 @@ void tell_bottree(int idx)
                 botu = get_user_by_handle(userlist, bot->bot);
        
                 if (botu && bot_hublevel(botu) < 999)
-                  color = YELLOW(idx);
+                  color_str = (char *) YELLOW(idx);
                 if (botu && bot->localhub)
-                  color = RED(idx);
+                  color_str = (char *) RED(idx);
                 else
-                  color = NULL;
+                  color_str = (char *) NULL;
 
 		bot2 = bot;
                 if (bot->share)
                   i = sprintf(s, "%c", bot->share);
                 else
                   i = sprintf(s, "-");
-                i = sprintf(s + 1, "%s%s%s (%s %li)", color ? color : "",
+                i = sprintf(s + 1, "%s%s%s (%s %li)", color_str ? color_str : "",
                                                       bot->bot,
-                                                      color ? COLOR_END(idx) : "",
+                                                      color_str ? COLOR_END(idx) : "",
                                                       bot->version, bot->buildts);
 	      }
 	    }