X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fbot_NeonServ.c;h=99fd0466445264e4b51aadac2d630b5297db64ab;hb=bb5692b9cbff069abbf9573c81e86c3cd2061ceb;hp=58dced3a3a428d8d302f9892c9e8a7b0a9167b92;hpb=0b17bccd2d7fbef5652168d11d4f0af1f41252d3;p=NeonServV5.git

diff --git a/src/bot_NeonServ.c b/src/bot_NeonServ.c
index 58dced3..99fd046 100644
--- a/src/bot_NeonServ.c
+++ b/src/bot_NeonServ.c
@@ -1,5 +1,5 @@
 /* bot_NeonServ.c - NeonServ v5.3
- * Copyright (C) 2011  Philipp Kreil (pk910)
+ * 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
@@ -347,9 +347,9 @@ static const struct default_language_entry msgtab[] = {
     {"NS_NICKLIST_SYNC", "use `nicklist sync` to fix all red and orange entrys in the list above (add opped users with 200 and voiced with 100 access)"},
     {"NS_SETBOT_UNKNOWN", "`%d` is an unknown botid."}, /* {ARGS: 50} */
     {"NS_SETBOT_HEADER", "$bSettings for botid `%d`:$b"}, /* {ARGS: 50} */
-    {"NS_SETBOT_SETTING", "$b%s$b is an unknown bot setting."},
+    {"NS_SETBOT_SETTING", "$b%s$b is an unknown bot setting."}, /* {ARGS: "strangeSetting"} */
     {"NS_SETBOT_NICK_INVALID", "`%s` is an invalid botnick."}, /* {ARGS: "-SuperMagicBananaBotWithManyFunctions"} */
-    {"NS_SETBOT_NEED_RESTART", "You need to reconnect to bot to apply this setting."},
+    {"NS_SETBOT_NEED_RESTART", "You need to reconnect the bot to apply this setting."},
     {"NS_SETBOT_PORT_INVALID", "`%s` is an invalid port number."}, /* {ARGS: "-1"} */
     {"NS_SETBOT_INVALID_CLASS", "`%s` is an invalid botclass."}, /* {ARGS: "MistColaLeer"} */
     {"NS_SETBOT_MAXCHAN_INVALID", "`%s` is an invalid maxchan value."}, /* {ARGS: "-1"} */
@@ -361,6 +361,10 @@ static const struct default_language_entry msgtab[] = {
     {"NS_DELBOT_NOT_FOUND", "Bot with BotID / nick $b%s$b not found."}, /* {ARGS: "NeonServ"} */
     {"NS_DELBOT_DONE", "Bot deleted."},
     {"NS_RECONNECT_DONE", "Reconnected bot."},
+    {"NS_MODCMD_SETTING", "$b%s$b is an unknown modcmd setting."}, /* {ARGS: "strangeSetting"} */
+    {"NS_MODCMD_HEADER", "$bSettings for command %s:$b"}, /* {ARGS: "access"} */
+    {"NS_MODCMD_OUTRANKED", "$b%s$b outranks you. (required access: %d)"}, /* {ARGS: "die", 1000} */
+    {"NS_MODCMD_STATIC_FLAG", "This Flag is added statically. It can't be modified manually."},
     {NULL, NULL}
 };
 
@@ -446,7 +450,7 @@ static void start_bots() {
         connect_socket(client);
     }
     
-    printf_mysql_query("SELECT `command`, `function`, `parameters`, `global_access`, `chan_access` FROM `bot_binds` WHERE `botclass` = '%d'", BOTID);
+    printf_mysql_query("SELECT `command`, `function`, `parameters`, `global_access`, `chan_access`, `flags` FROM `bot_binds` WHERE `botclass` = '%d'", BOTID);
     res2 = mysql_use();
     while ((row = mysql_fetch_row(res2)) != NULL) {
         if(bind_cmd_to_command(BOTID, row[0], row[1])) {
@@ -459,6 +463,8 @@ static void start_bots() {
             if(row[4]) {
                 bind_set_channel_access(BOTID, row[0], row[4]);
             }
+            if(strcmp(row[5], "0"))
+                bind_set_bind_flags(BOTID, row[0], atoi(row[5]));
         }
     }
     bind_unbound_required_functions(BOTID);