From: rubin <redacted>
Date: Sun, 20 Jul 2008 16:07:34 +0000 (+0000)
Subject: spin fixes
X-Git-Tag: 1.9~284
X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/commitdiff_plain/8deb31d3a6f3eefe8b50932035926414b57c13a0

spin fixes
---

diff --git a/ChangeLog b/ChangeLog
index 388a699..40041c3 100644
--- 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 edac4f4..9bc91ac 100644
--- 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 04c3fb7..3296031 100644
--- 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");