From b003da35092f3e4f4a9279c822742d4f5215900e Mon Sep 17 00:00:00 2001
From: pk910 <philipp@zoelle1.de>
Date: Tue, 15 Nov 2011 16:09:08 +0100
Subject: [PATCH] fixed funcmd_reply and added missing include

---
 src/cmd_funcmds.c | 5 +++--
 src/cmd_funcmds.h | 1 +
 src/commands.c    | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/cmd_funcmds.c b/src/cmd_funcmds.c
index 7578f10..dca41a6 100644
--- a/src/cmd_funcmds.c
+++ b/src/cmd_funcmds.c
@@ -24,13 +24,14 @@
 #include "ChanNode.h"
 #include "lang.h"
 #include "tools.h"
+#include "DBHelper.h"
 
 static const struct default_language_entry msgtab[] = {
     {"FUN_DICE", "$b%s$b: A $b%d$b shows on the %d-sided die."}, /* {ARGS: "TestUser", 5, 6} */
     {"FUN_DICE_NUM", "I do not understand $b%s$b. Please use a single number above 1."}, /* {ARGS: "bla"} */
     {"FUN_8BALL", "$b%s$b: %s"}, /* {ARGS: "TestUser", "Not a chance."} */
     {"FUN_8BALL_REPLIES", "Not a chance.|In your dreams.|Absolutely!|Could be, could be.|No!"},
-    {"FUN_COOKIE", "gives %1%s a very big chocolate cookie. (%1$s got %2$d cookies - %3$d in this channel)"}, /* {ARGS: "TestUser", 20, 50} */
+    {"FUN_COOKIE", "gives %1$s a very big chocolate cookie. %1$s has got %2$d cookies until now (%3$d in this channel)."}, /* {ARGS: "TestUser", 20, 50} */
     {NULL, NULL}
 };
 
@@ -90,7 +91,7 @@ static void funcmd_reply(const char *text, int type, ...) {
     char sendBuf[MAXLEN];
     int pos;
     sendBuf[0] = '\0';
-    va_start(arg_list, text);
+    va_start(arg_list, type);
     pos = vsnprintf(sendBuf, MAXLEN - 2, formatBuf, arg_list);
     va_end(arg_list);
     if (pos < 0 || pos > (MAXLEN - 2)) pos = MAXLEN - 2;
diff --git a/src/cmd_funcmds.h b/src/cmd_funcmds.h
index 000b918..0e58c08 100644
--- a/src/cmd_funcmds.h
+++ b/src/cmd_funcmds.h
@@ -25,5 +25,6 @@ CMD_BIND(funcmd_ping);
 CMD_BIND(funcmd_pong);
 CMD_BIND(funcmd_dice);
 CMD_BIND(funcmd_8ball);
+CMD_BIND(funcmd_cookie);
 
 #endif
\ No newline at end of file
diff --git a/src/commands.c b/src/commands.c
index cece07d..c41a673 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -142,6 +142,7 @@ void register_commands() {
     USER_COMMAND("pong",         funcmd_pong,            0,  CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_FUNCMD);
     USER_COMMAND("dice",         funcmd_dice,            1,  CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_FUNCMD);
     USER_COMMAND("8ball",        funcmd_8ball,           1,  CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_FUNCMD);
+    USER_COMMAND("cookie",       funcmd_cookie,          0,  CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_FUNCMD);
     #undef USER_COMMAND
     
     
-- 
2.20.1