Move cmode +N to cmode +d, so that extensions/m_roleplay can retain cmode +N and...

diff --git a/help/opers/cmode b/help/opers/cmode
index 75de0a33f06f613d1d3abf6e3a5b57dca6177131..ba230c934cbb96599a7d0fd128d2379f5b70e0fb 100644 (file)
--- a/help/opers/cmode
+++ b/help/opers/cmode
@@ -18,6 +18,8 @@ NO PARAMETERS:
      +r     - Registered users only.  Only users identified to services
               may join.
      +c     - No color.  All color codes in messages are stripped.
+     +d     - No nickchanges. People on the channel will not be able to
+              change nick.
      +g     - Free invite.  Everyone may invite users.  Significantly
               weakens +i control.
      +z     - Op moderated.  Messages blocked by +m, +b and +q are instead
@@ -35,8 +37,6 @@ NO PARAMETERS:
      +T     - Disable notice. All notices to the channel are disallowed.
      +E     - No kicks. Chanops will not be able to use /kick on this
               channel.
-     +N     - No nickchanges. People on the channel will not be able to
-              change nick.
      +G     - Block messages in all caps. Messages that are more than
               50% capital letters will be blocked.
      +J     - Prevent autorejoin on kick. Users will not be able to

diff --git a/help/users/cmode b/help/users/cmode
index 5e40b798af2946baa7e56646f152c26e4017dc04..14075342e6975d546eb26ee2f3aadb773c989d59 100644 (file)
--- a/help/users/cmode
+++ b/help/users/cmode
@@ -18,6 +18,8 @@ NO PARAMETERS:
      +r     - Registered users only.  Only users identified to services
               may join.
      +c     - No color.  All color codes in messages are stripped.
+     +d     - No nickchanges. People on the channel will not be able to
+              change nick.
      +g     - Free invite.  Everyone may invite users.  Significantly
               weakens +i control.
      +z     - Op moderated.  Messages blocked by +m, +b and +q are instead
@@ -35,8 +37,6 @@ NO PARAMETERS:
      +T     - Disable notice. All notices to the channel are disallowed.
      +E     - No kicks. Chanops will not be able to use /kick on this
               channel.
-     +N     - No nickchanges. People on the channel will not be able to
-              change nick.
      +G     - Block messages in all caps. Messages that are more than
               50% capital letters will be blocked.
      +J     - Prevent autorejoin on kick. Users will not be able to

diff --git a/src/chmode.c b/src/chmode.c
index d5fa3a315ddbc96eefac9216acd21498100a67cd..f0ec84b6e331164f3c6c974f3b0dcb1a2f03bc91 100644 (file)
--- a/src/chmode.c
+++ b/src/chmode.c
@@ -1843,7 +1843,7 @@ struct ChannelMode chmode_table[256] =
   {chm_simple, MODE_NOREPEAT },        /* K */
   {chm_staff,  MODE_EXLIMIT },         /* L */
   {chm_hidden, MODE_NOOPERKICK },      /* M */
-  {chm_simple, MODE_NONICK },          /* N */
+  {chm_nosuch, 0 },                    /* N */
   {chm_nosuch, 0 },                    /* O */
   {chm_staff,  MODE_PERMANENT },       /* P */
   {chm_simple, MODE_DISFORWARD },      /* Q */
@@ -1865,7 +1865,7 @@ struct ChannelMode chmode_table[256] =
   {chm_admin,  0 },                    /* a */
   {chm_ban,    CHFL_BAN },             /* b */
   {chm_simple, MODE_NOCOLOR },         /* c */
-  {chm_nosuch, 0 },                    /* d */
+  {chm_simple, MODE_NONICK },          /* d */
   {chm_ban,    CHFL_EXCEPTION },       /* e */
   {chm_forward,        0 },                    /* f */
   {chm_simple, MODE_FREEINVITE },      /* g */

diff --git a/src/messages.tab b/src/messages.tab
index b23ffa8dab64720b171e9b4be28d95c5f7754bc6..2572c8169d01f811bbca2ecd30bf60e9c7f44a3f 100644 (file)
--- a/src/messages.tab
+++ b/src/messages.tab
@@ -470,7 +470,7 @@ static  const char *  replies[] = {
 /* 446 ERR_USERSDISABLED, */   NULL,
 /* 447 ERR_NOINVITE */         ":Can't send invite to %s (+V set)",
 /* 448 */       NULL,
-/* 449 ERR_NONICK */           "%s :Cannot change nickname while on channel (+N set)",
+/* 449 ERR_NONICK */           "%s :Cannot change nickname while on channel (+d set)",
 /* 450 */       NULL,
 /* 451 ERR_NOTREGISTERED, */    ":%s 451 * :You have not registered",
 /* 452 */       NULL,