* More organization

svn: 1204

src/flags.h

@@ -46,9 +46,6 @@ struct flag_record {
  *   unused letters: bchijpstw
  */
 
-#define ROLE_KICK_MDOP     (role)
-#define ROLE_KICK_MEAN     (role)
-
 #define DEFLAG_BADCOOKIE   1
 #define DEFLAG_MANUALOP    2
 #ifdef G_MEAN

src/mod/irc.mod/mode.c

@@ -952,10 +952,8 @@ gotmode(char *from, char *msg)
 
         /* check for mdop */
         if (me_op(chan)) {
+          if (role && (!u || (u && !u->bot)) && m && !chan_sentkick(m)) {
           if (deops >= 3) {
-            if (!u || !u->bot) {
-              if (ROLE_KICK_MDOP) {
-                if (m && !chan_sentkick(m)) {
                   m->flags |= SENTKICK;
                   sprintf(tmp, "KICK %s %s :%s%s\n", chan->name, nick, kickprefix, response(RES_MASSDEOP));
                   tputs(serv, tmp, strlen(tmp));
@@ -964,16 +962,10 @@ gotmode(char *from, char *msg)
                     deflag_user(u, DEFLAG_MDOP, tmp, chan);
                   }
                 }
-              }
-            }
-          }
 
           /* check for mop */
           if (ops >= 3) {
             if (channel_nomop(chan)) {
-              if (!u || !u->bot) {
-                if (ROLE_KICK_MDOP) {
-                  if (m && !chan_sentkick(m)) {
                     m->flags |= SENTKICK;
                     sprintf(tmp, "KICK %s %s :%s%s\n", chan->name, nick, kickprefix, response(RES_MANUALOP));
                     tputs(serv, tmp, strlen(tmp));
@@ -981,12 +973,10 @@ gotmode(char *from, char *msg)
                       sprintf(tmp, "Mass op on %s by %s", chan->dname, nick);
                       deflag_user(u, DEFLAG_MOP, tmp, chan);
                     }
-                  }
                 }
               }
               enforce_bitch(chan);      /* deop quick! */
-            }
-          }
+}
           if (ops && u) {
             if (u->bot && !channel_fastop(chan) && !channel_take(chan)) {
               int isbadop = 0;