]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Begin total re-write of generic command system
authorSamual <samual@xonotic.org>
Wed, 28 Dec 2011 01:13:11 +0000 (20:13 -0500)
committerSamual <samual@xonotic.org>
Wed, 28 Dec 2011 01:13:11 +0000 (20:13 -0500)
qcsrc/client/command/cl_cmd.qc
qcsrc/common/command/generic.qc
qcsrc/common/command/generic.qh
qcsrc/common/util.qh
qcsrc/menu/command/menu_cmd.qc
qcsrc/server/command/sv_cmd.qc

index f5bf58cfdab25f191fecd9cf1e960962df25ca07..db75f9eedc6e8c99b695b001247c549f076180d1 100644 (file)
@@ -462,7 +462,7 @@ void GameCommand(string command)
                {
                        print("\nUsage:^3 cl_cmd COMMAND...^7, where possible commands are:\n");
                        LocalCommand_macro_help();
-                       GameCommand_Generic("help");
+                       GenericCommand("help");
                        print("For help about specific commands, type cl_cmd help COMMAND\n");
                        return;
                } 
@@ -471,7 +471,7 @@ void GameCommand(string command)
                        return;
                }
        } 
-       else if(GameCommand_Generic(command)) 
+       else if(GenericCommand(command)) 
        {
                return; // handled by common/command/generic.qc
        }
index 1d21f0845049c9528104f5cb4b38bb54fe116d4b..a260c0fa791386168ffcde49718cf90464f6a7f5 100644 (file)
@@ -1,48 +1,7 @@
-#define MAX_RPN_STACK 16
-float rpn_db;
-float rpn_error;
-float rpn_sp;
-string rpn_stack[MAX_RPN_STACK];
-string rpn_pop() {
-       if(rpn_sp > 0) {
-               --rpn_sp;
-               return rpn_stack[rpn_sp];
-       } else {
-               print("rpn: stack underflow\n");
-               rpn_error = TRUE;
-               return "";
-       }
-}
-void rpn_push(string s) {
-       if(rpn_sp < MAX_RPN_STACK) {
-               rpn_stack[rpn_sp] = s;
-               ++rpn_sp;
-       } else {
-               print("rpn: stack overflow\n");
-               rpn_error = TRUE;
-       }
-}
-string rpn_get() {
-       if(rpn_sp > 0) {
-               return rpn_stack[rpn_sp - 1];
-       } else {
-               print("rpn: empty stack\n");
-               rpn_error = TRUE;
-               return "";
-       }
-}
-void rpn_set(string s) {
-       if(rpn_sp > 0) {
-               rpn_stack[rpn_sp - 1] = s;
-       } else {
-               print("rpn: empty stack\n");
-               rpn_error = TRUE;
-       }
-}
-float rpn_getf() { return stof(rpn_get()); }
-float rpn_popf() { return stof(rpn_pop()); }
-void rpn_pushf(float f) { return rpn_push(ftos(f)); }
-void rpn_setf(float f) { return rpn_set(ftos(f)); }
+// =========================================================
+//  Generic program common command code, reworked by Samual
+//  Last updated: December 28th, 2011
+// =========================================================
 
 #define NUM_MARKUPS    41
 float markup_init;
@@ -155,47 +114,123 @@ string GameCommand_Markup(string s2)
        return s;
 }
 
-float GameCommand_Generic(string command)
+void GenericCommand_addtolist(float request)
+{
+       switch(request)
+       {
+               case CMD_REQUEST_COMMAND:
+               {
+                       if(argc >= 2)
+                       {
+                               s = argv(1);
+                               s2 = argv(2);
+                               if(cvar_string(s) == "")
+                                       cvar_set(s, s2);
+                               else 
+                               {
+                                       n = tokenizebyseparator(cvar_string(s), " ");
+                                       for(i = 0; i < n; ++i)
+                                               if(argv(i) == s2)
+                                                       return; // already in list
+                                       cvar_set(s, strcat(s2, " ", cvar_string(s)));
+                               }
+                       }
+                       return;
+               }
+                       
+               default:
+               case CMD_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd \n");
+                       print("  No arguments required.\n");
+                       return;
+               }
+       }
+}
+
+/* use this when creating a new command, making sure to place it in alphabetical order... also,
+** ADD ALL NEW COMMANDS TO commands.cfg WITH PROPER ALIASES IN THE SAME FASHION!
+void GenericCommand_(float request)
 {
-       float argc;
-       float i, j, f, n;
-       vector rgb;
-       string s, s2, c;
-       argc = tokenize_console(command);
+       switch(request)
+       {
+               case CMD_REQUEST_COMMAND:
+               {
+                       
+                       return;
+               }
+                       
+               default:
+               case CMD_REQUEST_USAGE:
+               {
+                       print("\nUsage:^3 sv_cmd \n");
+                       print("  No arguments required.\n");
+                       return;
+               }
+       }
+}
+*/
+
+// ==================================
+//  Macro system for server commands
+// ==================================
+
+// Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
+#define GENERIC_COMMANDS(request,arguments,command) \
+       GENERIC_COMMAND("addtolist", GenericCommand_addtolist(request, arguments), "") \
+       GENERIC_COMMAND("", GenericCommand_(request, arguments), "") \
+       /* nothing */
+
+void GenericCommand_macro_help()
+{
+       #define GENERIC_COMMAND(name,function,description) \
+               { print("  ^2", name, "^7: ", description, "\n"); }
+               
+       GENERIC_COMMANDS(0, 0, "")
+       #undef GENERIC_COMMAND
+       
+       return;
+}
+
+float GenericCommand_macro_command(float argc, string command)
+{
+       #define GENERIC_COMMAND(name,function,description) \
+               { if(name == strtolower(argv(0))) { function; return TRUE; } }
+               
+       GENERIC_COMMANDS(CMD_REQUEST_COMMAND, argc, command)
+       #undef GENERIC_COMMAND
+       
+       return FALSE;
+}
+
+float GenericCommand_macro_usage(float argc)
+{
+       #define GENERIC_COMMAND(name,function,description) \
+               { if(name == strtolower(argv(1))) { function; return TRUE; } }
+               
+       GENERIC_COMMANDS(CMD_REQUEST_USAGE, argc, "")
+       #undef GENERIC_COMMAND
+       
+       return FALSE;
+}
+       
+
+// ===========================================
+//  Main Common Function For Generic Commands
+// ===========================================
+// Commands spread out among all programs (menu, client, and server) 
+
+float GenericCommand(string command)
+{
+       float argc = tokenize_console(command);
+
+       // Guide for working with argc arguments by example:
+       // argc:   1    - 2      - 3     - 4
+       // argv:   0    - 1      - 2     - 3 
+       // cmd     vote - master - login - password
+       
        if(argv(0) == "help")
        {
-               print("  rpn EXPRESSION... - a RPN calculator.\n");
-               print("    Operator description (x: string, s: set, f: float):\n");
-               print("    x pop ----------------------------->     : removes the top\n");
-               print("    x dup -----------------------------> x x : duplicates the top\n");
-               print("    x x exch --------------------------> x x : swap the top two\n");
-               print("    /cvarname load --------------------> x   : loads a cvar\n");
-               print("    /cvarname x def ------------------->     : writes to a cvar\n");
-               print("    f f add|sub|mul|div|mod|max|min ---> f   : adds/... two numbers\n");
-               print("    f f eq|ne|gt|ge|lt|le -------------> f   : compares two numbers\n");
-               print("    f neg|abs|sgn|rand|floor|ceil------> f   : negates/... a number\n");
-               print("    f f f bound -----------------------> f   : bounds the middle number\n");
-               print("    f1 f2 b when ----------------------> f   : f1 if b, f2 otherwise\n");
-               print("    s s union|intersection|difference -> s   : set operations\n");
-               print("    s shuffle -------------------------> s   : randomly arrange elements\n");
-               print("    /key /value put ------------------->     : set a database key\n");
-               print("    /key get --------------------------> s   : get a database value\n");
-               print("    x dbpush -------------------------->     : pushes the top onto the database\n");
-               print("    dbpop|dbget -----------------------> x   : removes/reads DB's top\n");
-               print("    dblen|dbat ------------------------> f   : gets the DB's size/cursor pos\n");
-               print("    dbclr ----------------------------->     : clear the DB\n");
-               print("    s dbsave|dbload-------------------->     : save/load the DB to/from a file\n");
-               print("    x dbins --------------------------->     : moves the top into the DB\n");
-               print("    dbext|dbread ----------------------> x   : extract/get from the DB's cursor\n");
-               print("    f dbmov|dbgoto -------------------->     : move or set the DB's cursor\n");
-               print("    s localtime -----------------------> s   : formats the current local time\n");
-               print("    s gmtime --------------------------> s   : formats the current UTC time\n");
-               print("    time ------------------------------> f   : seconds since VM start\n");
-               print("    s /MD4 digest ---------------------> s   : MD4 digest\n");
-               print("    s /SHA256 digest ------------------> s   : SHA256 digest\n");
-               print("    s /formatstring sprintf1s ---------> s   : sprintf with 1 string (pad, cut)\n");
-               print("    Set operations operate on 'such''strings'.\n");
-               print("    Unknown tokens insert their cvar value.\n");
                print("  maplist add map\n");
                print("  maplist remove map\n");
                print("  maplist shuffle\n");
@@ -204,8 +239,6 @@ float GameCommand_Generic(string command)
                print("  maplist lsmaps\n");
                print("  maplist lsnewmaps\n");
                print("  addtolist variable addedvalue\n");
-               print("  records\n");
-               print("  rankings (map argument optional)\n");
                print("  settemp cvar value\n");
                print("  settemp_restore\n");
                return TRUE;
@@ -256,18 +289,6 @@ float GameCommand_Generic(string command)
                        cvar_set("g_maplist", s2);
                        return TRUE;
                }
-               else if(argv(1) == "maplist") {
-                       print(maplist_reply);
-                       return TRUE;
-               }
-               else if(argv(1) == "lsmaps") {
-                       print(lsmaps_reply);
-                       return TRUE;
-               }
-               else if(argv(1) == "lsnewmaps") {
-                       print(lsnewmaps_reply);
-                       return TRUE;
-               }
        }
        else if(argc >= 3 && argv(0) == "red")
        {
@@ -350,467 +371,7 @@ float GameCommand_Generic(string command)
 
                return TRUE;
        }
-       else if(argv(0) == "rpn")
-       {
-               if(!rpn_db)
-               {
-                       rpn_db = db_create();
-                       db_put(rpn_db, "stack.pointer", "0");
-                       db_put(rpn_db, "stack.pos", "-1");
-               }
-               if(argc >= 2)
-               {
-                       float rpnpos;
-                       string rpncmd;
-                       float f2, f3;
-                       rpn_sp = 0;
-                       rpn_error = FALSE;
-                       for(rpnpos = 1; rpnpos < argc; ++rpnpos)
-                       {
-                               rpncmd = argv(rpnpos);
-                               f = strlen(rpncmd);
-                               if(rpncmd == "") {
-                               } else if(stof(substring(rpncmd, 0, 1)) > 0) {
-                                       rpn_push(rpncmd);
-                               } else if(substring(rpncmd, 0, 1) == "0") {
-                                       rpn_push(rpncmd);
-                               } else if(f >= 2 && substring(rpncmd, 0, 1) == "+") {
-                                       rpn_push(rpncmd);
-                               } else if(f >= 2 && substring(rpncmd, 0, 1) == "-") {
-                                       rpn_push(rpncmd);
-                               } else if(f >= 2 && substring(rpncmd, 0, 1) == "/") {
-                                       rpn_push(substring(rpncmd, 1, strlen(rpncmd) - 1));
-                               } else if(rpncmd == "clear") {
-                                       rpn_sp = 0;
-                               } else if(rpncmd == "def" || rpncmd == "=") {
-                                       s = rpn_pop();
-                                       s2 = rpn_pop();
-
-                                       if(s2 != "")
-                                       {
-#ifdef MENUQC
-                                               registercvar(s2, "", 0);
-#else
-                                               registercvar(s2, "");
-#endif
-                                               if(!rpn_error) // don't change cvars if a stack error had happened!
-                                                       cvar_set(s2, s);
-                                       }
-                                       else
-                                       {
-                                               print("rpn: empty cvar name for 'def'\n");
-                                               rpn_error = TRUE;
-                                       }
-                               } else if(rpncmd == "defs" || rpncmd == "@") {
-                                       s = "";
-                                       i = rpn_popf();
-                                       j = (i == 0);
-                                       while(rpn_sp > 1 && (j || i > 0))
-                                       {
-                                               s = strcat("/", rpn_pop(), " ", s);
-                                               --i;
-                                       }
-                                       s2 = rpn_pop();
-                                       if(s2 != "")
-                                       {
-#ifdef MENUQC
-                                               registercvar(s2, "", 0);
-#else
-                                               registercvar(s2, "");
-#endif
-                                               if(!rpn_error) // don't change cvars if a stack error had happened!
-                                                       cvar_set(s2, s);
-                                       }
-                                       else
-                                       {
-                                               print("rpn: empty cvar name for 'defs'\n");
-                                               rpn_error = TRUE;
-                                       }
-                               } else if(rpncmd == "load") {
-                                       rpn_set(cvar_string(rpn_get()));
-                               } else if(rpncmd == "exch") {
-                                       s = rpn_pop();
-                                       s2 = rpn_get();
-                                       rpn_set(s);
-                                       rpn_push(s2);
-                               } else if(rpncmd == "dup") {
-                                       rpn_push(rpn_get());
-                               } else if(rpncmd == "pop") {
-                                       rpn_pop();
-                               } else if(rpncmd == "add" || rpncmd == "+") {
-                                       f = rpn_popf();
-                                       rpn_setf(rpn_getf() + f);
-                               } else if(rpncmd == "sub" || rpncmd == "-") {
-                                       f = rpn_popf();
-                                       rpn_setf(rpn_getf() - f);
-                               } else if(rpncmd == "mul" || rpncmd == "*") {
-                                       f = rpn_popf();
-                                       rpn_setf(rpn_getf() * f);
-                               } else if(rpncmd == "div" || rpncmd == "/") {
-                                       f = rpn_popf();
-                                       rpn_setf(rpn_getf() / f);
-                               } else if(rpncmd == "mod" || rpncmd == "%") {
-                                       f = rpn_popf();
-                                       f2 = rpn_getf();
-                                       rpn_setf(f2 - f * floor(f2 / f));
-                               } else if(rpncmd == "abs") {
-                                       rpn_setf(fabs(rpn_getf()));
-                               } else if(rpncmd == "sgn") {
-                                       f = rpn_getf();
-                                       if(f < 0)
-                                               rpn_set("-1");
-                                       else if(f > 0)
-                                               rpn_set("1");
-                                       else
-                                               rpn_set("0");
-                               } else if(rpncmd == "neg" || rpncmd == "~") {
-                                       rpn_setf(-rpn_getf());
-                               } else if(rpncmd == "floor" || rpncmd == "f") {
-                                       rpn_setf(floor(rpn_getf()));
-                               } else if(rpncmd == "ceil" || rpncmd == "c") {
-                                       rpn_setf(ceil(rpn_getf()));
-                               } else if(rpncmd == "max") {
-                                       f = rpn_popf();
-                                       f2 = rpn_getf();
-                                       rpn_setf(max(f2, f));
-                               } else if(rpncmd == "min") {
-                                       f = rpn_popf();
-                                       f2 = rpn_getf();
-                                       rpn_setf(min(f2, f));
-                               } else if(rpncmd == "bound") {
-                                       f = rpn_popf();
-                                       f2 = rpn_popf();
-                                       f3 = rpn_getf();
-                                       rpn_setf(bound(f3, f2, f));
-                               } else if(rpncmd == "when") {
-                                       f = rpn_popf();
-                                       f2 = rpn_popf();
-                                       f3 = rpn_getf();
-                                       if(f)
-                                               rpn_setf(f3);
-                                       else
-                                               rpn_setf(f2);
-                               } else if(rpncmd == ">" || rpncmd == "gt") {
-                                       f = rpn_popf();
-                                       rpn_setf(rpn_getf() > f);
-                               } else if(rpncmd == "<" || rpncmd == "lt") {
-                                       f = rpn_popf();
-                                       rpn_setf(rpn_getf() < f);
-                               } else if(rpncmd == "==" || rpncmd == "eq") {
-                                       f = rpn_popf();
-                                       rpn_setf(rpn_getf() == f);
-                               } else if(rpncmd == ">=" || rpncmd == "ge") {
-                                       f = rpn_popf();
-                                       rpn_setf(rpn_getf() >= f);
-                               } else if(rpncmd == "<=" || rpncmd == "le") {
-                                       f = rpn_popf();
-                                       rpn_setf(rpn_getf() <= f);
-                               } else if(rpncmd == "!=" || rpncmd == "ne") {
-                                       f = rpn_popf();
-                                       rpn_setf(rpn_getf() != f);
-                               } else if(rpncmd == "rand") {
-                                       rpn_setf(ceil(random() * rpn_getf()) - 1);
-                               } else if(rpncmd == "crc16") {
-                                       rpn_setf(crc16(FALSE, rpn_get()));
-                               } else if(rpncmd == "put") {
-                                       s2 = rpn_pop();
-                                       if (!rpn_error)
-                                       {
-                                               s = rpn_pop();
-                                               if (!rpn_error)
-                                                       db_put(rpn_db, s, s2);
-                                       }
-                               } else if(rpncmd == "get") {
-                                       s = rpn_pop();
-                                       if (!rpn_error)
-                                               rpn_push(db_get(rpn_db, s));
-                               } else if(rpncmd == "dbpush") {
-                                       s = rpn_pop();
-                                       if(!rpn_error)
-                                       {
-                                               i = stof(db_get(rpn_db, "stack.pointer"));
-                                               db_put(rpn_db, "stack.pointer", ftos(i+1));
-                                               db_put(rpn_db, strcat("stack.", ftos(i)), s);
-                                       }
-                                       if(!i)
-                                               db_put(rpn_db, "stack.pos", "0");
-                               } else if(rpncmd == "dbpop") {
-                                       i = stof(db_get(rpn_db, "stack.pointer"));
-                                       if(i)
-                                       {
-                                               s = ftos(i-1);
-                                               db_put(rpn_db, "stack.pointer", s);
-                                               rpn_push(db_get(rpn_db, strcat("stack.", s)));
-                                               j = stof(db_get(rpn_db, "stack.pos"));
-                                               if(j >= i)
-                                                       db_put(rpn_db, "stack.pos", ftos(i-2));
-                                       } else {
-                                               rpn_error = 1;
-                                               print("rpn: database underflow\n");
-                                       }
-                               } else if(rpncmd == "dbget") {
-                                       
-                                       i = stof(db_get(rpn_db, "stack.pointer"));
-                                       if(i)
-                                       {
-                                               rpn_push(db_get(rpn_db, strcat("stack.", ftos(i-1))));
-                                       } else {
-                                               rpn_error = 1;
-                                               print("rpn: database empty\n");
-                                       }
-                               } else if(rpncmd == "dblen") {
-                                       rpn_push(db_get(rpn_db, "stack.pointer"));
-                               } else if(rpncmd == "dbclr") {
-                                       db_close(rpn_db);
-                                       rpn_db = db_create();
-                                       db_put(rpn_db, "stack.pointer", "0");
-                                       db_put(rpn_db, "stack.pos", "-1");
-                               } else if(rpncmd == "dbsave") {
-                                       s = rpn_pop();
-                                       if(!rpn_error)
-                                               db_save(rpn_db, s);
-                               } else if(rpncmd == "dbload") {
-                                       s = rpn_pop();
-                                       if(!rpn_error)
-                                       {
-                                               db_close(rpn_db);
-                                               rpn_db = db_load(s);
-                                       }
-                               } else if(rpncmd == "dbins") {
-                                       s = rpn_pop();
-                                       if(!rpn_error)
-                                               //if(rpn_sp > 0)
-                                       {
-                                               j = stof(db_get(rpn_db, "stack.pointer"));
-                                               i = stof(db_get(rpn_db, "stack.pos"));
-                                               
-                                               if(i < 0)
-                                               {
-                                                       i = 0;
-                                                       db_put(rpn_db, "stack.pos", "0");
-                                               }
-                                               
-                                               db_put(rpn_db, "stack.pointer", ftos(j+1));
-                                               for(--j; j >= i; --j)
-                                               {
-                                                       db_put(rpn_db, strcat("stack.", ftos(j+1)),
-                                                              db_get(rpn_db, (strcat("stack.", ftos(j))))
-                                                               );
-                                               }
-                                               db_put(rpn_db, strcat("stack.", ftos(i)), s);
-                                       }
-                               } else if(rpncmd == "dbext") {
-                                       j = stof(db_get(rpn_db, "stack.pointer"));
-                                       i = stof(db_get(rpn_db, "stack.pos"));
-                                       if(!j)
-                                       {
-                                               rpn_error = TRUE;
-                                               print("rpn: empty database\n");
-                                       } else {
-                                               --j;
-                                               rpn_push(db_get(rpn_db, strcat("stack.", ftos(i))));
-                                               db_put(rpn_db, "stack.pointer", ftos(j));
-                                               if(i == j)
-                                               {
-                                                       db_put(rpn_db, "stack.pos", ftos(j-1));
-                                               } else {
-                                                       while(i < j)
-                                                       {
-                                                               db_put(rpn_db, strcat("stack.", ftos(i)),
-                                                                      db_get(rpn_db, (strcat("stack.", ftos(i+1))))
-                                                                       );
-                                                               ++i;
-                                                       }
-                                               }
-                                       }
-                               } else if(rpncmd == "dbread") {
-                                       s = db_get(rpn_db, "stack.pos");
-                                       if(stof(s) >= 0)
-                                       {
-                                               rpn_push(db_get(rpn_db, strcat("stack.", s)));
-                                       } else {
-                                               rpn_error = 1;
-                                               print("rpn: empty database\n");
-                                       }
-                               } else if(rpncmd == "dbat") {
-                                       rpn_push(db_get(rpn_db, "stack.pos"));
-                               } else if(rpncmd == "dbmov") {
-                                       j = stof(db_get(rpn_db, "stack.pointer"));
-                                       i = stof(db_get(rpn_db, "stack.pos"));
-                                       i += rpn_popf();
-                                       if(!rpn_error)
-                                       {
-                                               if(i < 0 || i >= j)
-                                               {
-                                                       print("rpn: database cursor out of bounds\n");
-                                                       rpn_error = TRUE;
-                                               }
-                                               if(!rpn_error)
-                                               {
-                                                       db_put(rpn_db, "stack.pos", ftos(i));
-                                               }
-                                       }
-                               } else if(rpncmd == "dbgoto") {
-                                       s = rpn_pop();
-                                       j = stof(db_get(rpn_db, "stack.pointer"));
-                                       if(!j)
-                                       {
-                                               rpn_error = TRUE;
-                                               print("rpn: empty database, cannot move cursor\n");
-                                       }
-                                       if(!rpn_error)
-                                       {
-                                               if(s == "end")
-                                                       i = stof(db_get(rpn_db, "stack.pointer"))-1;
-                                               else if(s == "beg")
-                                                       i = 0;
-                                               else
-                                                       i = stof(s);
-                                               
-                                               j = stof(db_get(rpn_db, "stack.pointer"));
-                                               if(i < 0 || i >= j)
-                                               {
-                                                       print("rpn: database cursor destination out of bounds\n");
-                                                       rpn_error = TRUE;
-                                               }
-                                               if(!rpn_error)
-                                               {
-                                                       db_put(rpn_db, "stack.pos", ftos(i));
-                                               }
-                                       }
-                               } else if(rpncmd == "union") {
-                                       // s s2 union
-                                       s2 = rpn_pop();
-                                       s = rpn_get();
-                                       f = tokenize_console(s);
-                                       f2 = tokenize_console(strcat(s, " ", s2));
-                                       // tokens 0..(f-1) represent s
-                                       // tokens f..f2 represent s2
-                                       // UNION: add all tokens to s that are in s2 but not in s
-                                       s = "";
-                                       for(i = 0; i < f; ++i)  
-                                               s = strcat(s, " ", argv(i));
-                                       for(i = f; i < f2; ++i) {
-                                               for(j = 0; j < f; ++j)
-                                                       if(argv(i) == argv(j))
-                                                               goto skip_union;
-                                               s = strcat(s, " ", argv(i));
-:skip_union
-                                       }
-                                       if(substring(s, 0, 1) == " ")
-                                               s = substring(s, 1, 99999);
-                                       rpn_set(s);
-                                       tokenize_console(command);
-                               } else if(rpncmd == "intersection") {
-                                       // s s2 intersection
-                                       s2 = rpn_pop();
-                                       s = rpn_get();
-                                       f = tokenize_console(s);
-                                       f2 = tokenize_console(strcat(s, " ", s2));
-                                       // tokens 0..(f-1) represent s
-                                       // tokens f..f2 represent s2
-                                       // INTERSECTION: keep only the tokens from s that are also in s2
-                                       s = "";
-                                       for(i = 0; i < f; ++i) {
-                                               for(j = f; j < f2; ++j)
-                                                       if(argv(i) == argv(j))
-                                                       {
-                                                               s = strcat(s, " ", argv(i));
-                                                               break;
-                                                       }
-                                       }
-                                       if(substring(s, 0, 1) == " ")
-                                               s = substring(s, 1, 99999);
-                                       rpn_set(s);
-                                       tokenize_console(command);
-                               } else if(rpncmd == "difference") {
-                                       // s s2 difference
-                                       s2 = rpn_pop();
-                                       s = rpn_get();
-                                       f = tokenize_console(s);
-                                       f2 = tokenize_console(strcat(s, " ", s2));
-                                       // tokens 0..(f-1) represent s
-                                       // tokens f..f2 represent s2
-                                       // DIFFERENCE: keep only the tokens from s that are not in s2
-                                       s = "";
-                                       for(i = 0; i < f; ++i) {
-                                               for(j = f; j < f2; ++j)
-                                                       if(argv(i) == argv(j))
-                                                               goto skip_difference;
-                                               s = strcat(s, " ", argv(i));
-:skip_difference
-                                       }
-                                       if(substring(s, 0, 1) == " ")
-                                               s = substring(s, 1, 99999);
-                                       rpn_set(s);
-                                       tokenize_console(command);
-                               } else if(rpncmd == "shuffle") {
-                                       // s shuffle
-                                       s = rpn_get();
-                                       f = tokenize_console(s);
-
-                                       for(i = 0; i < f - 1; ++i) {
-                                               // move a random item from i..f-1 to position i
-                                               s = "";
-                                               f2 = floor(random() * (f - i) + i);
-                                               for(j = 0; j < i; ++j)
-                                                       s = strcat(s, " ", argv(j));
-                                               s = strcat(s, " ", argv(f2));
-                                               for(j = i; j < f; ++j)
-                                                       if(j != f2)
-                                                               s = strcat(s, " ", argv(j));
-                                               f = tokenize_console(s);
-                                       }
-
-                                       if(substring(s, 0, 1) == " ")
-                                               s = substring(s, 1, 99999);
-                                       rpn_set(s);
-                                       tokenize_console(command);
-                               } else if(rpncmd == "fexists_assert") {
-                                       s = rpn_pop();
-                                       if(!rpn_error)
-                                       {
-                                               if (!fexists(s))
-                                               {
-                                                       print("rpn: ERROR: ", s, " does not exist!\n");
-                                                       rpn_error = TRUE;
-                                               }
-                                       }
-                               } else if(rpncmd == "fexists") {
-                                       s = rpn_get();
-                                       if(!rpn_error)
-                                       {
-                                               if (fexists(s))
-                                                       rpn_setf(1);
-                                               else
-                                                       rpn_setf(0);
-                                       }
-                               } else if(rpncmd == "localtime") {
-                                       rpn_set(strftime(TRUE, rpn_get()));
-                               } else if(rpncmd == "gmtime") {
-                                       rpn_set(strftime(FALSE, rpn_get()));
-                               } else if(rpncmd == "time") {
-                                       rpn_pushf(time);
-                               } else if(rpncmd == "digest") {
-                                       s = rpn_pop();
-                                       rpn_set(digest_hex(s, rpn_get()));
-                               } else if(rpncmd == "sprintf1s") {
-                                       s = rpn_pop();
-                                       rpn_set(sprintf(s, rpn_get()));
-                               } else {
-                                       rpn_push(cvar_string(rpncmd));
-                               }
-                               if(rpn_error)
-                                       break;
-                       }
-                       while(rpn_sp > 0)
-                       {
-                               s = rpn_pop();
-                               print("rpn: still on stack: ", s, "\n");
-                       }
-                       return TRUE;
-               }
-       } else if(argv(0) == "addtolist") {
+       else if(argv(0) == "addtolist") {
                if(argc >= 2)
                {
                        s = argv(1);
@@ -827,17 +388,6 @@ float GameCommand_Generic(string command)
                }
                return TRUE;
        }
-       else if(argv(0) == "records") {
-               print(records_reply);
-               return TRUE;
-       }
-       else if(argv(0) == "ladder") {
-               print(ladder_reply);
-               return TRUE;
-       }
-       else if(argv(0) == "rankings") {
-               print(rankings_reply);
-               return TRUE;
 #ifdef MENUQC
        } else if(argv(0) == "cp") {
                if(argc >= 2)
index 3189d879dcbb8c66fc546ebed97522ed96fedb50..ee7097a4c72096cc8bae703045c0e63f82236158 100644 (file)
@@ -1 +1,2 @@
-// empty for now
\ No newline at end of file
+// empty for now
+float GenericCommand(string command); // returns true if handled, false if not. Note: It tokenizes its input, so be careful!
\ No newline at end of file
index 5b5888ba8c19c32eb2f2e3985e6b06c9c6438534..866880707d632bd49b04a305fa11f464178b7695 100644 (file)
@@ -20,10 +20,6 @@ void wordwrap_sprint(string s, float l);
 #endif
 void wordwrap_cb(string s, float l, void(string) callback)
 
-float GameCommand_Generic(string cmd);
-// returns TRUE if handled, FALSE otherwise
-// tokenizes its input!
-
 // iterative depth-first search, with fields that go "up", "down left" and "right" in a tree
 // for each element, funcPre is called first, then funcPre and funcPost for all its children, and funcPost last
 void depthfirst(entity start, .entity up, .entity downleft, .entity right, void(entity, entity) funcPre, void(entity, entity) funcPost, entity pass);
index 6a140f4fc87b6daf8eadb908f876b2473cbbbd61..3be6edc6629612eda6aca51ce768e850bd48c7bf 100644 (file)
@@ -64,11 +64,11 @@ void GameCommand(string theCommand)
                print(_("Usage: menu_cmd command..., where possible commands are:\n"));
                print(_("  sync - reloads all cvars on the current menu page\n"));
                print(_("  directmenu ITEM - select a menu item as main item\n"));
-               GameCommand_Generic("help");
+               GenericCommand("help");
                return;
        }
 
-       if(GameCommand_Generic(theCommand))
+       if(GenericCommand(theCommand))
                return;
 
        if(argv(0) == "sync")
index d86ffcc71993a116b1d874fc623c784b90b6dbc3..c553d88e73fefd531bf47d67161c2f0544c2f9c7 100644 (file)
@@ -1821,7 +1821,7 @@ void GameCommand(string command)
                        GameCommand_macro_help();
                        
                        GameCommand_Ban("help");
-                       GameCommand_Generic("help");
+                       GenericCommand("help");
                        print("For help about specific commands, type sv_cmd help COMMAND\n");
                        return;
                } 
@@ -1834,7 +1834,7 @@ void GameCommand(string command)
        {
                return; // handled by server/ipban.qc
        }
-       else if(GameCommand_Generic(command)) 
+       else if(GenericCommand(command)) 
        {
                return; // handled by common/gamecommand.qc
        }