removed +q/+a prefixes

diff --git a/Changes b/Changes
index 74e6109611b1f068b47e0b4def7e9d51dbcc415b..a62ff8dbdd678801d562874b3c464800c565b163 100644 (file)
--- a/Changes
+++ b/Changes
@@ -586,3 +586,8 @@ SJ3 fixes from codemastr for possible desynch
 Fixed prefix problem as per nighthawk
 --Luke
 ===================================
+
+Temp removed +q/+a prefixes to give client coders
+chance to implement PREFIX= sanely
+--Luke
+===================================

diff --git a/include/common.h b/include/common.h
index 47fc80b4021b86a749af2c9df61fc3c1d1ffc633..7bb4408fe192f6d5d17fd1c3fd8297005e4925f7 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -238,7 +238,7 @@ extern struct SLink *find_user_link( /* struct SLink *, struct Client * */ );
                             TOPICLEN, \
                             TOPICLEN, \
                             "#",      \
-                            "(qaohv)~&@%+", \
+                            "(ohv)@%+", \
                            "ohvbeqa", \
                            "kfL", \
                            "l", \

diff --git a/src/channel.c b/src/channel.c
index c38425e83af53d6bafa2470ec44900f1362ad6b0..c4f6110ec78f4c0c951d858efce38a92847b7045 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -4432,11 +4432,11 @@ int  m_names(cptr, sptr, parc, parv)
                                    CHFL_CHANOWNER)) && acptr != sptr)
                                        continue;
 
-               if (cm->flags & CHFL_CHANOWNER)
+/*             if (cm->flags & CHFL_CHANOWNER)
                        buf[idx++] = '~';
                else if (cm->flags & CHFL_CHANPROT)
-                       buf[idx++] = '&';
-               else if (cm->flags & CHFL_CHANOP)
+                       buf[idx++] = '&';  */
+               if (cm->flags & CHFL_CHANOP)
                        buf[idx++] = '@';
                else if (cm->flags & CHFL_HALFOP)
                        buf[idx++] = '%';

diff --git a/src/s_user.c b/src/s_user.c
index cf79b71a5ebc8ae7078e262ce9fa01aa705117d0..85425e1e6b177814126f797e9bf3e621b57cb281 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -2514,13 +2514,13 @@ static void do_who(sptr, acptr, repchan)
 
        
        /* Channel owner */
-       if (repchan && is_chanowner(acptr, repchan))
-               status[i++] = '~';
+/*     if (repchan && is_chanowner(acptr, repchan))
+               status[i++] = '~';  */
        /* Channel protected */
-       else if (repchan && is_chanprot(acptr, repchan))
-               status[i++] = '&';
+/*     else if (repchan && is_chanprot(acptr, repchan))
+               status[i++] = '&';  */
        /* Channel operator */
-       else if (repchan && is_chan_op(acptr, repchan))
+       if (repchan && is_chan_op(acptr, repchan))
                status[i++] = '@';
 
        /* Channel halfop */
@@ -2886,11 +2886,11 @@ int  m_whois(cptr, sptr, parc, parv)
 #endif
                                                                                                                                                                                && SecretChannel(chptr))
                                                         *(buf + len++) = '!';
-                                               if (is_chanowner(acptr, chptr))
+               /*                              if (is_chanowner(acptr, chptr))
                                                        *(buf + len++) = '~';
                                                else if (is_chanprot(acptr, chptr))
-                                                       *(buf + len++) = '&';
-                                               else if (is_chan_op(acptr, chptr))
+                                                       *(buf + len++) = '&';  */
+                                               if (is_chan_op(acptr, chptr))
                                                        *(buf + len++) = '@';
                                                else if (is_half_op(acptr, chptr))
                                                        *(buf + len++) = '%';