X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fbots.c;h=353abc5a4d1cf7bd39b520f2499d18dce096d085;hb=689da1db7e2517c187ce76c6c553e20d630a7f36;hp=d239dffaeced9ff4bc0dd4489825fe8b8b469829;hpb=5a9d04e79a4d27880eb5a588cbc50e00a4cd26aa;p=NeonServV5.git

diff --git a/src/bots.c b/src/bots.c
index d239dff..353abc5 100644
--- a/src/bots.c
+++ b/src/bots.c
@@ -1,5 +1,5 @@
-/* bots.c - NeonServ v5.3
- * Copyright (C) 2011  Philipp Kreil (pk910)
+/* bots.c - NeonServ v5.4
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,11 +26,6 @@
 #include "modcmd.h"
 #include "DBHelper.h"
 
-#include "bot_NeonServ.h"
-#include "bot_NeonSpam.h"
-#include "bot_DummyServ.h"
-#include "bot_NeonHelp.h"
-
 struct cmd_bot_alias {
     int botid;
     char *alias;
@@ -87,7 +82,10 @@ static void zero_bots_trigger_callback(int clientid, struct ChanNode *chan, char
     }
     printf_mysql_query("SELECT `trigger`, `defaulttrigger` FROM `bot_channels` LEFT JOIN `bots` ON `botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '0' AND `botid` = '%d'", chan->channel_id, clientid);
     res = mysql_use();
-    row = mysql_fetch_row(res);
+    if(!(row = mysql_fetch_row(res))) {
+        strcpy(trigger, "");
+        return;
+    }
     if(row[0] && *row[0])
         strcpy(trigger, row[0]);
     else
@@ -95,14 +93,9 @@ static void zero_bots_trigger_callback(int clientid, struct ChanNode *chan, char
 }
 
 void init_bots() {
-    init_NeonServ();
-    init_NeonSpam();
-    init_DummyServ();
-    init_NeonHelp();
-    
     set_bot_alias(0, "0");
     start_zero_bots();
-    set_trigger_callback(0, zero_bots_trigger_callback);
+    set_trigger_callback(0, 0, zero_bots_trigger_callback);
     
     MYSQL_RES *res;
     MYSQL_ROW row;
@@ -113,7 +106,7 @@ void init_bots() {
     while ((row = mysql_fetch_row(res)) != NULL) {
         if(atol(row[1]) - time(0) > 0) {
             sprintf(nameBuf, "ban_%s", row[0]);
-            timeq_add_name(nameBuf, atol(row[1]) - time(0), channel_ban_timeout, strdup(row[0]));
+            timeq_add_name(nameBuf, atol(row[1]) - time(0), 0, channel_ban_timeout, strdup(row[0]));
         } else {
             //timed out
             printf_mysql_query("DELETE FROM `bans` WHERE `ban_id` = '%s'", row[0]);
@@ -121,20 +114,6 @@ void init_bots() {
     }
 }
 
-void loop_bots() {
-    loop_NeonServ();
-    loop_NeonSpam();
-    loop_DummyServ();
-    loop_NeonHelp();
-}
-
-void free_bots() {
-    free_NeonServ();
-    free_NeonSpam();
-    free_DummyServ();
-    free_NeonHelp();
-}
-
 struct ClientSocket *getChannelBot(struct ChanNode *chan, int botid) {
     struct ClientSocket *bot, *use_bot = NULL, *second_bot = NULL, *third_bot = NULL;
     struct ChanUser *chanuser;