X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fcommand%2Fgeneric.qc;h=1c32c86befbeefdfd74f35f48608a396fdeb1234;hp=b06eac1fc9b0c983c1255e38d3b4554de01f3eb6;hb=0ee74987765518ffed584a790f90607c3f3f8e71;hpb=64d5496f37e2f20f847b74638f38d49a15835c56 diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc index b06eac1fc..1c32c86be 100644 --- a/qcsrc/common/command/generic.qc +++ b/qcsrc/common/command/generic.qc @@ -41,7 +41,7 @@ void Curl_URI_Get_Callback(float id, float status, string data) strunzone(do_cvar); } if(!do_exec) - if not(do_cvar) + if (!do_cvar) print(data); } @@ -57,12 +57,12 @@ void GenericCommand_addtolist(float request, float argc) case CMD_REQUEST_COMMAND: { float i; - + if(argc >= 2) { string original_cvar = argv(1); string tmp_string = argv(2); - + if(cvar_string(original_cvar) == "") // cvar was empty { cvar_set(original_cvar, tmp_string); @@ -70,17 +70,17 @@ void GenericCommand_addtolist(float request, float argc) else // add it to the end of the list if the list doesn't already have it { argc = tokenizebyseparator(cvar_string(original_cvar), " "); - + for(i = 0; i < argc; ++i) if(argv(i) == tmp_string) return; // already in list - + cvar_set(original_cvar, strcat(tmp_string, " ", cvar_string(original_cvar))); } return; } } - + default: print("Incorrect parameters for ^2addtolist^7\n"); case CMD_REQUEST_USAGE: @@ -162,7 +162,7 @@ void GenericCommand_qc_curl(float request, float argc) return; } - + default: case CMD_REQUEST_USAGE: { @@ -181,33 +181,33 @@ void GenericCommand_dumpcommands(float request) float fh; string filename = strcat(GetProgramCommandPrefix(), "_dump.txt"); fh = fopen(filename, FILE_WRITE); - + if(fh >= 0) { #ifdef SVQC CMD_Write("dump of server console commands:\n"); GameCommand_macro_write_aliases(fh); - + CMD_Write("\ndump of networked client only commands:\n"); ClientCommand_macro_write_aliases(fh); - + CMD_Write("\ndump of common commands:\n"); CommonCommand_macro_write_aliases(fh); CMD_Write("\ndump of ban commands:\n"); BanCommand_macro_write_aliases(fh); #endif - + #ifdef CSQC CMD_Write("dump of client commands:\n"); LocalCommand_macro_write_aliases(fh); #endif - + CMD_Write("\ndump of generic commands:\n"); GenericCommand_macro_write_aliases(fh); - + print("Completed dump of aliases in ^2data/data/", GetProgramCommandPrefix(), "_dump.txt^7.\n"); - + fclose(fh); } else @@ -216,7 +216,7 @@ void GenericCommand_dumpcommands(float request) } return; } - + default: case CMD_REQUEST_USAGE: { @@ -236,7 +236,7 @@ void GenericCommand_dumpnotifs(float request) #ifndef MENUQC float fh, alsoprint = FALSE; string filename = argv(1); - + if(filename == "") { filename = "notifications_dump.cfg"; @@ -248,7 +248,7 @@ void GenericCommand_dumpnotifs(float request) alsoprint = TRUE; } fh = fopen(filename, FILE_WRITE); - + if(fh >= 0) { Dump_Notifications(fh, alsoprint); @@ -264,7 +264,7 @@ void GenericCommand_dumpnotifs(float request) #endif return; } - + default: case CMD_REQUEST_USAGE: { @@ -338,7 +338,7 @@ void GenericCommand_maplist(float request, float argc) { string tmp_string; float i; - + switch(argv(1)) { case "add": // appends new maps to the maplist @@ -350,63 +350,63 @@ void GenericCommand_maplist(float request, float argc) print("maplist: ERROR: ", argv(2), " does not exist!\n"); break; } - + if(cvar_string("g_maplist") == "") cvar_set("g_maplist", argv(2)); else cvar_set("g_maplist", strcat(argv(2), " ", cvar_string("g_maplist"))); - + return; } break; // go to usage } - + case "cleanup": // scans maplist and only adds back the ones which are really usable { MapInfo_Enumerate(); MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 0); argc = tokenizebyseparator(cvar_string("g_maplist"), " "); - + tmp_string = ""; for(i = 0; i < argc; ++i) if(MapInfo_CheckMap(argv(i))) tmp_string = strcat(tmp_string, " ", argv(i)); - + tmp_string = substring(tmp_string, 1, strlen(tmp_string) - 1); cvar_set("g_maplist", tmp_string); - + return; } - + case "remove": // scans maplist and only adds back whatever maps were not provided in argv(2) { if(argc == 3) { argc = tokenizebyseparator(cvar_string("g_maplist"), " "); - + tmp_string = ""; for(i = 0; i < argc; ++i) if(argv(i) != argv(2)) tmp_string = strcat(tmp_string, " ", argv(i)); - + tmp_string = substring(tmp_string, 1, strlen(tmp_string) - 1); cvar_set("g_maplist", tmp_string); - + return; } break; // go to usage } - + case "shuffle": // randomly shuffle the maplist { cvar_set("g_maplist", shufflewords(cvar_string("g_maplist"))); return; } - + default: break; } } - + default: print("Incorrect parameters for ^2maplist^7\n"); case CMD_REQUEST_USAGE: @@ -429,7 +429,7 @@ void GenericCommand_nextframe(float request, float arguments, string command) queue_to_execute_next_frame(substring(command, argv_start_index(1), argv_end_index(-1) - argv_start_index(1))); return; } - + default: case CMD_REQUEST_USAGE: { @@ -452,21 +452,21 @@ void GenericCommand_removefromlist(float request, float argc) string original_cvar = argv(1); string removal = argv(2); string tmp_string; - + argc = tokenizebyseparator(cvar_string(original_cvar), " "); - + tmp_string = ""; for(i = 0; i < argc; ++i) if(argv(i) != removal) tmp_string = strcat(tmp_string, " ", argv(i)); - + tmp_string = substring(tmp_string, 1, strlen(tmp_string) - 1); cvar_set(original_cvar, tmp_string); - + return; } } - + default: print("Incorrect parameters for ^2removefromlist^7\n"); case CMD_REQUEST_USAGE: @@ -489,18 +489,20 @@ void GenericCommand_restartnotifs(float request) print(sprintf( strcat( "Restart_Notifications(): Restarting %d notifications... ", - "Counts: MSG_ANNCE = %d, MSG_INFO = %d, MSG_CENTER = %d, MSG_MULTI = %d\n" + "Counts: MSG_ANNCE = %d, MSG_INFO = %d, MSG_CENTER = %d, MSG_MULTI = %d, MSG_CHOICE = %d\n" ), ( NOTIF_ANNCE_COUNT + NOTIF_INFO_COUNT + NOTIF_CENTER_COUNT + - NOTIF_MULTI_COUNT + NOTIF_MULTI_COUNT + + NOTIF_CHOICE_COUNT ), NOTIF_ANNCE_COUNT, NOTIF_INFO_COUNT, NOTIF_CENTER_COUNT, - NOTIF_MULTI_COUNT + NOTIF_MULTI_COUNT, + NOTIF_CHOICE_COUNT )); Destroy_All_Notifications(); CALL_ACCUMULATED_FUNCTION(RegisterNotifications); @@ -509,7 +511,7 @@ void GenericCommand_restartnotifs(float request) #endif return; } - + default: case CMD_REQUEST_USAGE: { @@ -530,7 +532,7 @@ void GenericCommand_settemp(float request, float argc) { float f = cvar_settemp(argv(1), argv(2)); if(f == 1) - dprint("Creating new settemp tracker for ", argv(1), " and setting it to \"", argv(2), "\" temporarily.\n"); + dprint("Creating new settemp tracker for ", argv(1), " and setting it to \"", argv(2), "\" temporarily.\n"); else if(f == -1) dprint("Already had a tracker for ", argv(1), ", updating it to \"", argv(2), "\".\n"); // else cvar_settemp itself errors out @@ -558,15 +560,15 @@ void GenericCommand_settemp_restore(float request, float argc) case CMD_REQUEST_COMMAND: { float i = cvar_settemp_restore(); - + if(i) dprint("Restored ", ftos(i), " temporary cvar settings to their original values.\n"); else dprint("Nothing to restore.\n"); - + return; } - + default: case CMD_REQUEST_USAGE: { @@ -594,7 +596,7 @@ void GenericCommand_runtest(float request, float argc) TEST_RunAll(); return; } - + default: case CMD_REQUEST_USAGE: { @@ -612,10 +614,10 @@ void GenericCommand_(float request) { case CMD_REQUEST_COMMAND: { - + return; } - + default: case CMD_REQUEST_USAGE: { @@ -652,10 +654,10 @@ void GenericCommand_macro_help() { #define GENERIC_COMMAND(name,function,description) \ { print(" ^2", name, "^7: ", description, "\n"); } - + GENERIC_COMMANDS(0, 0, "") #undef GENERIC_COMMAND - + return; } @@ -663,10 +665,10 @@ 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; } @@ -674,10 +676,10 @@ 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; } @@ -685,18 +687,18 @@ void GenericCommand_macro_write_aliases(float fh) { #define GENERIC_COMMAND(name,function,description) \ { CMD_Write_Alias("qc_cmd_svmenu", name, description); } - + GENERIC_COMMANDS(0, 0, "") #undef GENERIC_COMMAND - + return; } - + // =========================================== // Main Common Function For Generic Commands // =========================================== -// Commands spread out among all programs (menu, client, and server) +// Commands spread out among all programs (menu, client, and server) float GenericCommand(string command) { @@ -707,9 +709,9 @@ float GenericCommand(string command) // Guide for working with argc arguments by example: // argc: 1 - 2 - 3 - 4 - // argv: 0 - 1 - 2 - 3 + // argv: 0 - 1 - 2 - 3 // cmd vote - master - login - password - + if(GenericCommand_macro_command(argc, command)) // continue as usual and scan for normal commands { return TRUE; // handled by one of the above GenericCommand_* functions @@ -765,7 +767,7 @@ float GenericCommand(string command) // test case for terencehill's color codes s = strdecolorize(substring(command, argv_start_index(2), argv_end_index(-1) - argv_start_index(2))); s2 = ""; - + n = strlen(s); j = ((6 * max(1, floor(strlen(s)/32 + random() * 2 - 1))) / n) * (1 - 2 * (random() > 0.5)); f = random() * 6;