[cvslog] (2003-11-27 03:20:35 UTC) Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Wed Nov 26 21:20:35 CST 2003


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2003-11-27 03:20:34 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

Modified files:
     language/core.danish.lang language/core.english.lang
     language/core.french.lang language/core.german.lang src/botcmd.c
     src/cmds.c src/flags.c src/lang.h src/patch.h

Log message:

* Cosmetic fixes to .who.

---------------------- diff included ----------------------
Index: eggdrop1.6/language/core.danish.lang
diff -u eggdrop1.6/language/core.danish.lang:1.6 eggdrop1.6/language/core.danish.lang:1.7
--- eggdrop1.6/language/core.danish.lang:1.6	Wed Nov 26 19:07:46 2003
+++ eggdrop1.6/language/core.danish.lang	Wed Nov 26 21:20:24 2003
@@ -1,7 +1,7 @@
 # core.danish.lang
 #   core language messages for eggdrop
 #
-# $Id: core.danish.lang,v 1.6 2003/11/27 01:07:46 wcc Exp $
+# $Id: core.danish.lang,v 1.7 2003/11/27 03:20:24 wcc Exp $
 
 # General stuff
 0x001,Brug
@@ -91,9 +91,6 @@
 0x50c,Genstarter...
 0x50d,es
 0x50e,Skifter logfiler...
-0x50f,ejer
-0x510,master
-0x511,op
 0x512,idle
 0x513,VÆK
 0x516,Afbrudt
Index: eggdrop1.6/language/core.english.lang
diff -u eggdrop1.6/language/core.english.lang:1.38 eggdrop1.6/language/core.english.lang:1.39
--- eggdrop1.6/language/core.english.lang:1.38	Wed Nov 26 19:07:46 2003
+++ eggdrop1.6/language/core.english.lang	Wed Nov 26 21:20:24 2003
@@ -1,7 +1,7 @@
 # core.english.lang
 #   core language messages for eggdrop
 #
-# $Id: core.english.lang,v 1.38 2003/11/27 01:07:46 wcc Exp $
+# $Id: core.english.lang,v 1.39 2003/11/27 03:20:24 wcc Exp $
 
 # General stuff
 0x001,Usage
@@ -91,9 +91,6 @@
 0x50c,Restarting...
 0x50d,es
 0x50e,Switching logfiles...
-0x50f,owner
-0x510,master
-0x511,op
 0x512,idle
 0x513,AWAY
 0x516,Disconnected
Index: eggdrop1.6/language/core.french.lang
diff -u eggdrop1.6/language/core.french.lang:1.29 eggdrop1.6/language/core.french.lang:1.30
--- eggdrop1.6/language/core.french.lang:1.29	Wed Nov 26 19:07:46 2003
+++ eggdrop1.6/language/core.french.lang	Wed Nov 26 21:20:24 2003
@@ -1,7 +1,7 @@
 # core.french.lang
 #   core language messages for eggdrop
 #
-# $Id: core.french.lang,v 1.29 2003/11/27 01:07:46 wcc Exp $
+# $Id: core.french.lang,v 1.30 2003/11/27 03:20:24 wcc Exp $
 
 
 # General stuff
@@ -92,9 +92,6 @@
 0x50c,Redémarrage...
 0x50d,s
 0x50e,Rotation des fichiers de log...
-0x50f,propriétaire
-0x510,maître
-0x511,op
 0x512,inactif
 0x513,ABSENT
 0x516,Déconnecté
Index: eggdrop1.6/language/core.german.lang
diff -u eggdrop1.6/language/core.german.lang:1.32 eggdrop1.6/language/core.german.lang:1.33
--- eggdrop1.6/language/core.german.lang:1.32	Mon Mar 10 19:22:25 2003
+++ eggdrop1.6/language/core.german.lang	Wed Nov 26 21:20:24 2003
@@ -6,7 +6,7 @@
 # Modified by Michael for 1.3.25.
 # Modified by rtc for 1.4.0
 #
-# $Id: core.german.lang,v 1.32 2003/03/11 01:22:25 wcc Exp $
+# $Id: core.german.lang,v 1.33 2003/11/27 03:20:24 wcc Exp $
 
 # General stuff
 0x001,Gebrauch
@@ -98,9 +98,6 @@
 0x50c,Starte neu...
 0x50d,es
 0x50e,Wechsle Logdateien...
-0x50f,Besitzer
-0x510,Master
-0x511,Op
 0x512,untaetig
 0x513,ABWESEND
 # Ueberarbeiten, brauche kontext:
Index: eggdrop1.6/src/botcmd.c
diff -u eggdrop1.6/src/botcmd.c:1.38 eggdrop1.6/src/botcmd.c:1.39
--- eggdrop1.6/src/botcmd.c:1.38	Sun Mar  9 23:26:41 2003
+++ eggdrop1.6/src/botcmd.c	Wed Nov 26 21:20:24 2003
@@ -3,7 +3,7 @@
  *   commands that comes across the botnet
  *   userfile transfer and update commands from sharebots
  *
- * $Id: botcmd.c,v 1.38 2003/03/10 05:26:41 wcc Exp $
+ * $Id: botcmd.c,v 1.39 2003/11/27 03:20:24 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -331,36 +331,32 @@
       }
     }
   if (i > 10) {
-    botnet_send_priv(idx, botnetnick, nick, NULL, "%s  (%s)", s, ver);
+    botnet_send_priv(idx, botnetnick, nick, NULL, "%s (%s)", s, ver);
   } else
-    botnet_send_priv(idx, botnetnick, nick, NULL, "%s  (%s)", BOT_NOCHANNELS,
+    botnet_send_priv(idx, botnetnick, nick, NULL, "%s (%s)", BOT_NOCHANNELS,
                      ver);
   if (admin[0])
     botnet_send_priv(idx, botnetnick, nick, NULL, "Admin: %s", admin);
   if (chan == 0)
-    botnet_send_priv(idx, botnetnick, nick, NULL,
-                     "%s  (* = %s, + = %s, @ = %s)",
-                     BOT_PARTYMEMBS, MISC_OWNER, MISC_MASTER, MISC_OP);
+    botnet_send_priv(idx, botnetnick, nick, NULL, "%s (* = owner, + = master,"
+                     " %% = botmaster, @ = op, ^ = halfop)", BOT_PARTYMEMBS);
   else {
     simple_sprintf(s, "assoc %d", chan);
     if ((Tcl_Eval(interp, s) != TCL_OK) || !interp->result[0])
-      botnet_send_priv(idx, botnetnick, nick, NULL,
-                       "%s %s%d:  (* = %s, + = %s, @ = %s)\n",
-                       BOT_PEOPLEONCHAN,
-                       (chan < GLOBAL_CHANS) ? "" : "*",
-                       chan % GLOBAL_CHANS, MISC_OWNER, MISC_MASTER, MISC_OP);
+      botnet_send_priv(idx, botnetnick, nick, NULL, "%s %s%d: (* = owner, + ="
+                       " master, %% = botmaster, @ = op, ^ = halfop)\n",
+                       BOT_PEOPLEONCHAN, (chan < GLOBAL_CHANS) ? "" : "*",
+                       chan % GLOBAL_CHANS);
     else
-      botnet_send_priv(idx, botnetnick, nick, NULL,
-                       "%s '%s' (%s%d):  (* = %s, + = %s, @ = %s)\n",
-                       BOT_PEOPLEONCHAN, interp->result,
-                       (chan < GLOBAL_CHANS) ? "" : "*",
-                       chan % GLOBAL_CHANS, MISC_OWNER, MISC_MASTER, MISC_OP);
+      botnet_send_priv(idx, botnetnick, nick, NULL, "%s '%s' (%s%d): (* = "
+                       "owner, + = master, %% = botmaster, @ = op, ^ = halfop)\n",
+                       BOT_PEOPLEONCHAN, interp->result, (chan < GLOBAL_CHANS) ?
+                       "" : "*", chan % GLOBAL_CHANS);
   }
   for (i = 0; i < dcc_total; i++)
     if (dcc[i].type->flags & DCT_REMOTEWHO)
       if (dcc[i].u.chat->channel == chan) {
-        k = sprintf(s, "  %c%-15s %s",
-                    (geticon(i) == '-' ? ' ' : geticon(i)),
+        k = sprintf(s, "  %c%-15s %s", (geticon(i) == '-' ? ' ' : geticon(i)),
                     dcc[i].nick, dcc[i].host);
         if (now - dcc[i].timeval > 300) {
           unsigned long days, hrs, mins;
Index: eggdrop1.6/src/cmds.c
diff -u eggdrop1.6/src/cmds.c:1.101 eggdrop1.6/src/cmds.c:1.102
--- eggdrop1.6/src/cmds.c:1.101	Sat Nov  1 17:26:57 2003
+++ eggdrop1.6/src/cmds.c	Wed Nov 26 21:20:24 2003
@@ -3,7 +3,7 @@
  *   commands from a user via dcc
  *   (split in 2, this portion contains no-irc commands)
  *
- * $Id: cmds.c,v 1.101 2003/11/01 23:26:57 wcc Exp $
+ * $Id: cmds.c,v 1.102 2003/11/27 03:20:24 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -90,23 +90,21 @@
   int i, k, ok = 0, atr = u ? u->flags : 0;
   int nicklen;
   char format[81];
-  char s[1024];                 /* temp fix - 1.4 has a better one */
+  char s[1024]; /* temp fix - 1.4 has a better one */
 
   if (!chan)
-    dprintf(idx, "%s  (* = %s, + = %s, @ = %s)\n",
-            BOT_PARTYMEMBS, MISC_OWNER, MISC_MASTER, MISC_OP);
+    dprintf(idx, "%s (* = owner, + = master, %% = botmaster, @ = op, "
+            "^ = halfop)\n", BOT_PARTYMEMBS);
   else {
     simple_sprintf(s, "assoc %d", chan);
     if ((Tcl_Eval(interp, s) != TCL_OK) || !interp->result[0])
-      dprintf(idx, "%s %s%d:  (* = %s, + = %s, @ = %s)\n",
-              BOT_PEOPLEONCHAN,
-              (chan < GLOBAL_CHANS) ? "" : "*",
-              chan % GLOBAL_CHANS, MISC_OWNER, MISC_MASTER, MISC_OP);
+      dprintf(idx, "%s %s%d: (* = owner, + = master, %% = botmaster, @ = op, "
+              "^ = halfop)\n", BOT_PEOPLEONCHAN, (chan < GLOBAL_CHANS) ? "" :
+              "*", chan % GLOBAL_CHANS);
     else
-      dprintf(idx, "%s '%s' (%s%d):  (* = %s, + = %s, @ = %s)\n",
-              BOT_PEOPLEONCHAN, interp->result,
-              (chan < GLOBAL_CHANS) ? "" : "*",
-              chan % GLOBAL_CHANS, MISC_OWNER, MISC_MASTER, MISC_OP);
+      dprintf(idx, "%s '%s' (%s%d): (* = owner, + = master, %% = botmaster, @ = op, "
+              "^ = halfop)\n", BOT_PEOPLEONCHAN, interp->result,
+              (chan < GLOBAL_CHANS) ? "" : "*", chan % GLOBAL_CHANS);
   }
 
   /* calculate max nicklen */
Index: eggdrop1.6/src/flags.c
diff -u eggdrop1.6/src/flags.c:1.25 eggdrop1.6/src/flags.c:1.26
--- eggdrop1.6/src/flags.c:1.25	Thu Feb 27 04:18:40 2003
+++ eggdrop1.6/src/flags.c	Wed Nov 26 21:20:24 2003
@@ -2,7 +2,7 @@
  * flags.c -- handles:
  *   all the flag matching/conversion functions in one neat package :)
  *
- * $Id: flags.c,v 1.25 2003/02/27 10:18:40 tothwolf Exp $
+ * $Id: flags.c,v 1.26 2003/11/27 03:20:24 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -322,15 +322,15 @@
   if (!dcc[idx].user)
     return '-';
   get_user_flagrec(dcc[idx].user, &fr, 0);
-  if (chan_owner(fr))
+  if (glob_owner(fr) || chan_owner(fr))
     return '*';
-  if (chan_master(fr))
+  if (glob_master(fr) || chan_master(fr))
     return '+';
   if (glob_botmast(fr))
     return '%';
-  if (chan_op(fr))
+  if (glob_op(fr) || chan_op(fr))
     return '@';
-  if (chan_halfop(fr))
+  if (glob_halfop(fr) || chan_halfop(fr))
     return '^';
   return '-';
 }
Index: eggdrop1.6/src/lang.h
diff -u eggdrop1.6/src/lang.h:1.31 eggdrop1.6/src/lang.h:1.32
--- eggdrop1.6/src/lang.h:1.31	Mon Mar 10 19:22:25 2003
+++ eggdrop1.6/src/lang.h	Wed Nov 26 21:20:24 2003
@@ -2,7 +2,7 @@
  * lang.h
  *   Conversion definitions for language support
  *
- * $Id: lang.h,v 1.31 2003/03/11 01:22:25 wcc Exp $
+ * $Id: lang.h,v 1.32 2003/11/27 03:20:24 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -70,9 +70,9 @@
 #define MISC_RESTARTING         get_language(0x50c)
 #define MISC_MATCH_PLURAL       get_language(0x50d)
 #define MISC_LOGSWITCH          get_language(0x50e)
-#define MISC_OWNER              get_language(0x50f)
-#define MISC_MASTER             get_language(0x510)
-#define MISC_OP                 get_language(0x511)
+/* was: MISC_OWNER              0x50f            */
+/* was: MISC_MASTER             0x510            */
+/* was: MISC_OP                 0x511            */
 #define MISC_IDLE               get_language(0x512)
 #define MISC_AWAY               get_language(0x513)
 /* was: MISC_IGNORING           0x514            */
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1013 eggdrop1.6/src/patch.h:1.1014
--- eggdrop1.6/src/patch.h:1.1013	Wed Nov 26 20:44:12 2003
+++ eggdrop1.6/src/patch.h	Wed Nov 26 21:20:24 2003
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1013 2003/11/27 02:44:12 wcc Exp $
+ * $Id: patch.h,v 1.1014 2003/11/27 03:20:24 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1069901024");            /* current unixtime */
+patch("1069903199");            /* current unixtime */
 /*
  *
  *
  */
-patch("help-and-docs2");
+patch("who-cosmetic");
 /*
  *
  *
----------------------- End of diff -----------------------


More information about the Changes mailing list