[X2serv-cvs] [CVS] Module x3: Change committed

[Alex S. <ru...@us...>]

Committer  : Alex Schumann <ru...@us...>
CVSROOT    : /cvsroot/x2serv
Module     : x3
Commit time: 2005-05-28 05:41:25 UTC

Modified files:
     ChangeLog.X3 src/chanserv.c

Log message:

Resync fix

---------------------- diff included ----------------------
Index: x3/ChangeLog.X3
diff -u x3/ChangeLog.X3:1.36 x3/ChangeLog.X3:1.37
--- x3/ChangeLog.X3:1.36	Fri May 27 22:28:31 2005
+++ x3/ChangeLog.X3	Fri May 27 22:41:15 2005
@@ -1,6 +1,10 @@
 /***********************************************************************
  X3 ChangeLog
 
+2005-05-27  Alex Schumann  <ru...@af...>
+
+	* src/chanserv.c: Resync working now
+
 2005-05-27  Reed Loden  <re...@re...>
 
 	* src/chanserv.c: Fixed an incorrectly named message. Fixed some
@@ -241,5 +245,5 @@
 
 ***********************************************************************/
 
-#define CVS_VERSION "$Revision: 1.36 $"
+#define CVS_VERSION "$Revision: 1.37 $"
 
Index: x3/src/chanserv.c
diff -u x3/src/chanserv.c:1.30 x3/src/chanserv.c:1.31
--- x3/src/chanserv.c:1.30	Fri May 27 22:28:32 2005
+++ x3/src/chanserv.c	Fri May 27 22:41:15 2005
@@ -4478,7 +4478,7 @@
         {
             if(mn->modes & MODE_CHANOP)
             {
-                changes->args[used].mode = MODE_REMOVE | (mn->modes & ~MODE_CHANOP);
+                changes->args[used].mode = MODE_REMOVE |  MODE_CHANOP;
                 changes->args[used++].u.member = mn;
             }
             if(!(mn->modes & MODE_HALFOP))
@@ -4486,22 +4486,24 @@
                 changes->args[used].mode = MODE_HALFOP;
                 changes->args[used++].u.member = mn;
             }
+            /* why cant halfops keep voice
             if(mn->modes & MODE_VOICE)
             {
                 changes->args[used].mode = MODE_REMOVE | (mn->modes & ~MODE_VOICE);
                 changes->args[used++].u.member = mn;
             }
+            */
         }
         else if(uData && uData->access >= UL_PEON /* cData->lvlOpts[lvlGiveVoice]*/)
         {
             if(mn->modes & MODE_CHANOP)
             {
-                changes->args[used].mode = MODE_REMOVE | (mn->modes & ~MODE_CHANOP);
+                changes->args[used].mode = MODE_REMOVE | MODE_CHANOP;
                 changes->args[used++].u.member = mn;
             }
             if(mn->modes & MODE_HALFOP)
             {
-                changes->args[used].mode = MODE_REMOVE | (mn->modes & ~MODE_HALFOP);
+                changes->args[used].mode = MODE_REMOVE | MODE_HALFOP;
                 changes->args[used++].u.member = mn;
             }
             if(!(mn->modes & MODE_VOICE))
----------------------- End of diff -----------------------