Fix for <trigger>shoot telling you to use .roulette instead of <trigger>roulette

diff --git a/ChangeLog b/ChangeLog
index 5f1bf74ac5f4687de6a3cb85b86c519a29038344..59f07973fd6cb8d408ff50d09db9833a07cbc986 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 /***********************************************************************
 X3 ChangeLog
 
+2008-09-27  Matthew Beeching  <jobe@mdbnet.co.uk>
+
+       * src/chanserv.c: Fix for <trigger>shoot telling you to use
+        .roulette instead of <trigger>roulette
+
 2008-09-15  Neil Spierling  <sirvulcan@sirvulcan.co.nz>
 
        * src/proto-p10.c: SGLINE and SSHUN support some stuff coming

diff --git a/src/chanserv.c b/src/chanserv.c
index 5b4838cc542b8b49482950caad2cadc57da53b2f..5555f7c97a2f2f895097863a8055feff39b6ae3b 100644 (file)
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -525,7 +525,7 @@ static const struct message_entry msgtab[] = {
     { "CSMSG_HUGGLES_HIM", "\001ACTION huggles %s\001" },
     { "CSMSG_HUGGLES_YOU", "\001ACTION huggles you\001" },
     { "CSMSG_ROULETTE_LOADS",  "\001ACTION loads the gun and sets it on the table\001" },
-    { "CSMSG_ROULETTE_NEW", "Please type .roulette to start a new round" } ,
+    { "CSMSG_ROULETTE_NEW", "Please type %croulette to start a new round" } ,
     { "CSMSG_ROULETTE_BETTER_LUCK", "Better luck next time, %s" },
     { "CSMSG_ROULETTE_BANG", "Bang!!!" } ,
     { "CSMSG_ROULETTE_CLICK", "Click" } ,
@@ -7039,7 +7039,10 @@ static CHANSERV_FUNC(cmd_shoot)
         struct chanData *cData = channel->channel_info;
 
         if (cData->roulette_chamber <= 0) {
-            reply("CSMSG_ROULETTE_NEW");
+            struct service *service;
+            if ((service = service_find(chanserv->nick))) {
+                reply("CSMSG_ROULETTE_NEW", service->trigger);
+            }
             return 1;
         }