X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2Fcommands.c;h=51d4b3fcf416c8bdf46207666fc98668d325b543;hp=f8da0363bef88871cc3bba3ffe70cb54947fbfa7;hb=5eee43a7cfa37d5dd8d8a612a94de09a048b30c0;hpb=ffc462dec2b405f14d7b13d37e17b95ea6fdf2f5

diff --git a/src/commands.c b/src/commands.c
index f8da036..51d4b3f 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -18,6 +18,7 @@
 #include "cmd_global.h"
 #include "cmd_neonserv.h"
 #include "cmd_neonspam.h"
+#include "cmd_funcmds.h"
 #include "modcmd.h"
 
 void register_commands() {
@@ -27,6 +28,8 @@ void register_commands() {
     //               NAME            FUNCTION        PARAMS     PRIVS                FLAGS
     USER_COMMAND("version",      global_cmd_version,   0, NULL,                   0);
     USER_COMMAND("netinfo",      global_cmd_netinfo,   0, NULL,                   0);
+    USER_COMMAND("commands",     global_cmd_commands,  0, NULL,                   0);
+    USER_COMMAND("command",      global_cmd_command,   1, NULL,                   0);
     #undef USER_COMMAND
     
     #define OPER_COMMAND(NAME,FUNCTION,PARAMCOUNT,GACCESS,FLAGS) register_command(0, NAME, FUNCTION, PARAMCOUNT, NULL, GACCESS, FLAGS)
@@ -45,7 +48,7 @@ void register_commands() {
     #undef OPER_COMMAND
     
     //NeonServ Commands
-    register_bot_alias(1, "NeonServ");
+    register_command_alias(1, "NeonServ");
     
     #define USER_COMMAND(NAME,FUNCTION,PARAMCOUNT,PRIVS,FLAGS) register_command(1, NAME, FUNCTION, PARAMCOUNT, PRIVS, 0, FLAGS)
     //               NAME              FUNCTION        PARAMS     PRIVS                FLAGS
@@ -95,7 +98,6 @@ void register_commands() {
     USER_COMMAND("inviteme",     neonserv_cmd_inviteme,  0, "#channel_getinvite",   CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_LOG);
     USER_COMMAND("help",         neonserv_cmd_help,      0, NULL,                   0);
     USER_COMMAND("events",       neonserv_cmd_events,    0, "1",                    CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH);
-    USER_COMMAND("command",      neonserv_cmd_command,   1, NULL,                   0);
     USER_COMMAND("info",         neonserv_cmd_info,      0, NULL,                   CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN);
     USER_COMMAND("extscript",    neonserv_cmd_extscript, 0, NULL,                   CMDFLAG_EMPTY_ARGS | CMDFLAG_CHAN_PARAM);
     #undef USER_COMMAND
@@ -119,12 +121,22 @@ void register_commands() {
     #undef OPER_COMMAND
     
     //NeonSpam Commands
-    register_bot_alias(2, "NeonSpam");
+    register_command_alias(2, "NeonSpam");
     
     #define USER_COMMAND(NAME,FUNCTION,PARAMCOUNT,PRIVS,FLAGS) register_command(2, NAME, FUNCTION, PARAMCOUNT, PRIVS, 0, FLAGS)
     //               NAME              FUNCTION        PARAMS     PRIVS                FLAGS
     USER_COMMAND("set",          neonspam_cmd_set,       0, "#channel_setters",     CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_LOG);
     #undef USER_COMMAND
     
+    //Fun Commands
+    register_command_alias(3, "FunCMD");
+    #define USER_COMMAND(NAME,FUNCTION,PARAMCOUNT,FLAGS) register_command(3, NAME, FUNCTION, PARAMCOUNT, NULL, 0, FLAGS)
+    //               NAME              FUNCTION        PARAMS   FLAGS
+    USER_COMMAND("extscript",    neonserv_cmd_extscript, 0,  CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_EMPTY_ARGS | CMDFLAG_CHAN_PARAM | CMDFLAG_FUNCMD);
+    USER_COMMAND("ping",         funcmd_ping,            0,  CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_FUNCMD);
+    USER_COMMAND("pong",         funcmd_pong,            0,  CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_FUNCMD);
+    #undef USER_COMMAND
+    
+    
     
 }
\ No newline at end of file