spin fixes

diff --git a/ChangeLog b/ChangeLog
index 388a699678d8d9d35c2cdb275a5c397adf5096c8..40041c3a5120b315cf4e48f9f05dc3fcfe99c15f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@ X3 ChangeLog
 
 2008-07-20  Alex Schumann  <rubin@afternet.org>
 
-       * src/chanserv.c: remove spin debugging code
+       * src/chanserv.c: remove spin debugging code. Fix gline/kill glitch.
 
        * src/config.h: bump trunk to 1.7
 

diff --git a/src/chanserv.c b/src/chanserv.c
index edac4f40909429b7aaac029fb645e3fb29d7c43b..9bc91ac4378eb8bfad60d64de6b666745073c5ca 100644 (file)
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -7132,7 +7132,7 @@ static CHANSERV_FUNC(cmd_spin)
          send_target_message(1, channel->name, chanserv, "CSMSG_SPIN_GLINE");
 
          gline_add(chanserv->nick, target, wtime, "Reward for spinning the wheel of misfortune!", now, 1, 0);
-         irc_kill(chanserv, user, "Reward for spinning the wheel of misfortune!");
+//         irc_kill(chanserv, user, "Reward for spinning the wheel of misfortune!");
     }
     /* random shun */
     else if (!strcasecmp(wheel, "shun")) {
@@ -7230,7 +7230,8 @@ static CHANSERV_FUNC(cmd_spin)
     else if (!strcasecmp(wheel, "kill")) {
          send_target_message(1, channel->name, chanserv, "CSMSG_SPIN_KILL");
 
-         irc_kill(chanserv, user, "Reward for spinning the wheel of misfortune!");
+        DelUser(user, chanserv, 1, "Reward for spinning the wheel of misfortune!");
+         //irc_kill(chanserv, user, "Reward for spinning the wheel of misfortune!");
     }
     /* service ignore */
     else if (!strcasecmp(wheel, "svsignore")) {

diff --git a/src/chanserv.help b/src/chanserv.help
index 04c3fb7f1589efe608f8700a7172642748fd87d4..3296031b19d1f1c89c25c9d0b815843fdfa46576 100644 (file)
--- a/src/chanserv.help
+++ b/src/chanserv.help
@@ -273,6 +273,15 @@
        "8BALL answers yes or no questions, color queistions, numerical questions, and location questions.",
        "If you do not have access in the channel, the answer may be reported to you privately instead of in the channel.",
        "$uSee Also:$u dice, calc");
+"ROULETTE" ("/msg $C ROULETTE",
+        "ROULETTE loads the gun for a game of russion roulette. Use FIRE to shoot it",
+        "$uSee Also:$u fire, spin");
+"FIRE"  ("/msg $C FIRE",
+        "FIRE the gun (after you load it with ROULETTE). WARNING: this may kill you.",
+        "$uSee Also:$u roulette, spin");
+"SPIN"  ("/msg $C SPIN",
+        "This plas a game of Wheel-Of-Misfortune. WARNING: this will result in serious injury or death. Do not play this game if you are faint of heart!",
+        "$uSee Also:$u roulette");
 "CLIST" ("/msg $C CLIST <#channel> [mask]",
         "This command lists all users of level $bCoowner$b on a channel's userlist. If a mask is supplied, only coowners matching the mask will be shown.",
         "$uSee Also:$u addcoowner, delcoowner, mdelcoowner, users");