LOC fix for non-ldap LOC where ldap is available

[irc/evilnet/x3.git] / src / chanserv.c

diff --git a/src/chanserv.c b/src/chanserv.c
index b5d405b499565380ddc56ccdd6ec978f744b4bda..b3ecb6bc681b7cf89c415def1da62e445d3d2764 100644 (file)
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -7010,7 +7010,7 @@ static CHANSERV_FUNC(cmd_roulette)
 
         if (cData) {
             if (cData->roulette_chamber) {
-                irc_kill(chanserv, user, "BANG - Don't stuff bullets into a loaded gun");
+               DelUser(user, chanserv, 1, "BANG - Don't stuff bullets into a loaded gun");
                 return 1;
             }
         
@@ -7036,7 +7036,7 @@ static CHANSERV_FUNC(cmd_shoot)
         if (cData->roulette_chamber == 0) {
             reply("CSMSG_ROULETTE_BANG");
             reply("CSMSG_ROULETTE_BETTER_LUCK", user->nick);
-            irc_kill(chanserv, user, "BANG!!!!");
+            DelUser(user, chanserv, 1, "BANG!!!!");
         } else
             reply("CSMSG_ROULETTE_CLICK");
     }
@@ -7087,7 +7087,10 @@ static CHANSERV_FUNC(cmd_spin)
 
     if (wheel == 1) {
          send_target_message(1, channel->name, chanserv, "CSMSG_SPIN_1");
-         irc_kill(chanserv, user, "Connection reset by peer");
+         if (type < 7)
+              irc_kill(chanserv, user, "Connection reset by peer");
+         else
+              sputsock("%s SQ %s :Connection reset by peer", self->numeric, user->numeric);
     }
     if (wheel == 2) {
          send_target_message(1, channel->name, chanserv, "CSMSG_SPIN_2");
@@ -7192,7 +7195,7 @@ static CHANSERV_FUNC(cmd_spin)
                break;
          }
 
-         SVSNickChange(chanserv, user, abusednick);
+         SVSNickChange(user, abusednick);
          irc_svsnick(chanserv, user, abusednick);
 
          clone = AddClone(oldnick, oldident, oldhost, "I got abused by the wheel of misfortune :D");
@@ -9343,7 +9346,7 @@ init_chanserv(const char *nick)
     DEFINE_COMMAND(reply, 1, 0, "flags", "+nolog,+toy,+acceptchan", NULL);
     DEFINE_COMMAND(roulette, 1, 0, "flags", "+nolog,+toy,+acceptchan", NULL);
     DEFINE_COMMAND(shoot, 1, 0, "flags", "+nolog,+toy,+acceptchan", NULL);
-    DEFINE_COMMAND(spin, 1, 0, "spin", "+nolog,+toy,+acceptchan", NULL);
+    DEFINE_COMMAND(spin, 1, MODCMD_REQUIRE_AUTHED, "spin", "+nolog,+toy,+acceptchan", NULL);
 
     /* Channel options */
     DEFINE_CHANNEL_OPTION(defaulttopic);