X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=sv_ccmds.c;h=eb8821d13c8d68e99f9bd196b1575706409b0536;hb=refs%2Fheads%2Fdoombringer;hp=27847ffb3b3948c4bc30cc4051dd4a056c7689b8;hpb=f13419f00e3f8335e9a25498560a433597f28f50;p=xonotic%2Fdarkplaces.git diff --git a/sv_ccmds.c b/sv_ccmds.c index 27847ffb..eb8821d1 100644 --- a/sv_ccmds.c +++ b/sv_ccmds.c @@ -61,9 +61,9 @@ static void SV_Map_f(cmd_state_t *cmd) if (gamemode == GAME_DELUXEQUAKE) Cvar_Set(&cvars_all, "warpmark", ""); - cls.demonum = -1; // stop demo loop in case this fails + if(host.hook.Disconnect) + host.hook.Disconnect(); - CL_Disconnect (); SV_Shutdown(); if(svs.maxclients != svs.maxclients_next) @@ -74,12 +74,8 @@ static void SV_Map_f(cmd_state_t *cmd) svs.clients = (client_t *)Mem_Alloc(sv_mempool, sizeof(client_t) * svs.maxclients); } -#ifdef CONFIG_MENU - // remove menu - if (key_dest == key_menu || key_dest == key_menu_grabbed) - MR_ToggleMenu(0); -#endif - key_dest = key_game; + if(host.hook.ToggleMenu) + host.hook.ToggleMenu(); svs.serverflags = 0; // haven't completed an episode yet strlcpy(level, Cmd_Argv(cmd, 1), sizeof(level)); @@ -112,12 +108,8 @@ static void SV_Changelevel_f(cmd_state_t *cmd) return; } -#ifdef CONFIG_MENU - // remove menu - if (key_dest == key_menu || key_dest == key_menu_grabbed) - MR_ToggleMenu(0); -#endif - key_dest = key_game; + if(host.hook.ToggleMenu) + host.hook.ToggleMenu(); SV_SaveSpawnparms (); strlcpy(level, Cmd_Argv(cmd, 1), sizeof(level)); @@ -148,13 +140,17 @@ static void SV_Restart_f(cmd_state_t *cmd) Con_Print("Only the server may restart\n"); return; } + + prvm_prog_t *prog = SVVM_prog; + if (PRVM_serverfunction(RestartTriggered)) + { + Con_DPrint("Calling RestartTriggered\n"); + PRVM_serverglobalfloat(time) = sv.time; + prog->ExecuteProgram(prog, PRVM_serverfunction(RestartTriggered), "QC function RestartTriggered is missing"); + } -#ifdef CONFIG_MENU - // remove menu - if (key_dest == key_menu || key_dest == key_menu_grabbed) - MR_ToggleMenu(0); -#endif - key_dest = key_game; + if(host.hook.ToggleMenu) + host.hook.ToggleMenu(); strlcpy(mapname, sv.name, sizeof(mapname)); SV_SpawnServer(mapname); @@ -416,16 +412,10 @@ static void SV_Pause_f(cmd_state_t *cmd) else print = SV_ClientPrintf; - if (!pausable.integer) + if (!pausable.integer && cmd->source == src_client && LHNETADDRESS_GetAddressType(&host_client->netconnection->peeraddress) != LHNETADDRESSTYPE_LOOP) { - if (cmd->source == src_client) - { - if(cls.state == ca_dedicated || host_client != &svs.clients[0]) // non-admin - { - print("Pause not allowed.\n"); - return; - } - } + print("Pause not allowed.\n"); + return; } sv.paused ^= 1; @@ -496,7 +486,7 @@ static void SV_Say(cmd_state_t *cmd, qbool teamonly) SV_ClientPrint(text); host_client = save; - if (cls.state == ca_dedicated) + if(!host_isclient.integer) Con_Print(&text[1]); } @@ -718,68 +708,6 @@ static void SV_Pings_f(cmd_state_t *cmd) MSG_WriteString(&host_client->netconnection->message, "\n"); } -/* -==================== -SV_User_f - -user - -Dump userdata / masterdata for a user -==================== -*/ -static void SV_User_f(cmd_state_t *cmd) // credit: taken from QuakeWorld -{ - int uid; - int i; - - if (Cmd_Argc(cmd) != 2) - { - Con_Printf ("Usage: user \n"); - return; - } - - uid = atoi(Cmd_Argv(cmd, 1)); - - for (i = 0;i < cl.maxclients;i++) - { - if (!cl.scores[i].name[0]) - continue; - if (cl.scores[i].qw_userid == uid || !strcasecmp(cl.scores[i].name, Cmd_Argv(cmd, 1))) - { - InfoString_Print(cl.scores[i].qw_userinfo); - return; - } - } - Con_Printf ("User not in server.\n"); -} - -/* -==================== -SV_Users_f - -Dump userids for all current players -==================== -*/ -static void SV_Users_f(cmd_state_t *cmd) // credit: taken from QuakeWorld -{ - int i; - int c; - - c = 0; - Con_Printf ("userid frags name\n"); - Con_Printf ("------ ----- ----\n"); - for (i = 0;i < cl.maxclients;i++) - { - if (cl.scores[i].name[0]) - { - Con_Printf ("%6i %4i %s\n", cl.scores[i].qw_userid, cl.scores[i].frags, cl.scores[i].name); - c++; - } - } - - Con_Printf ("%i total users\n", c); -} - /* ================== SV_Status_f @@ -820,7 +748,7 @@ static void SV_Status_f(cmd_state_t *cmd) print ("version: %s build %s (gamename %s)\n", gamename, buildstring, gamenetworkfiltername); print ("protocol: %i (%s)\n", Protocol_NumberForEnum(sv.protocol), Protocol_NameForEnum(sv.protocol)); print ("map: %s\n", sv.name); - print ("timing: %s\n", Host_TimingReport(vabuf, sizeof(vabuf))); + print ("timing: %s\n", SV_TimingReport(vabuf, sizeof(vabuf))); print ("players: %i active (%i max)\n\n", players, svs.maxclients); if (in == 1) @@ -1137,7 +1065,7 @@ static void SV_Kick_f(cmd_state_t *cmd) { if (cmd->source == src_local) { - if (cls.state == ca_dedicated) + if(!host_isclient.integer) who = "Console"; else who = cl_name.string; @@ -1346,7 +1274,7 @@ static void SV_Viewmodel_f(cmd_state_t *cmd) { prvm_prog_t *prog = SVVM_prog; prvm_edict_t *e; - dp_model_t *m; + model_t *m; if (!sv.active) return; @@ -1375,7 +1303,7 @@ static void SV_Viewframe_f(cmd_state_t *cmd) prvm_prog_t *prog = SVVM_prog; prvm_edict_t *e; int f; - dp_model_t *m; + model_t *m; if (!sv.active) return; @@ -1393,7 +1321,7 @@ static void SV_Viewframe_f(cmd_state_t *cmd) } } -static void PrintFrameName (dp_model_t *m, int frame) +static void PrintFrameName (model_t *m, int frame) { if (m->animscenes) Con_Printf("frame %i: %s\n", frame, m->animscenes[frame].name); @@ -1410,7 +1338,7 @@ static void SV_Viewnext_f(cmd_state_t *cmd) { prvm_prog_t *prog = SVVM_prog; prvm_edict_t *e; - dp_model_t *m; + model_t *m; if (!sv.active) return; @@ -1437,7 +1365,7 @@ static void SV_Viewprev_f(cmd_state_t *cmd) { prvm_prog_t *prog = SVVM_prog; prvm_edict_t *e; - dp_model_t *m; + model_t *m; if (!sv.active) return; @@ -1470,7 +1398,7 @@ static void SV_SendCvar_f(cmd_state_t *cmd) cvarname = Cmd_Argv(cmd, 1); old = host_client; - if (cls.state != ca_dedicated) + if(host_isclient.integer) i = 1; else i = 0; @@ -1491,7 +1419,6 @@ static void SV_Ent_Create_f(cmd_state_t *cmd) int i; qbool haveorigin; - qbool expectval = false; void (*print)(const char *, ...) = (cmd->source == src_client ? SV_ClientPrintf : Con_Printf); if(!Cmd_Argc(cmd)) @@ -1530,31 +1457,24 @@ static void SV_Ent_Create_f(cmd_state_t *cmd) } // Allow more than one key/value pair by cycling between expecting either one. - for(i = 2; i < Cmd_Argc(cmd); i++) + for(i = 2; i < Cmd_Argc(cmd); i += 2) { - if(!expectval) + if(!(key = PRVM_ED_FindField(prog, Cmd_Argv(cmd, i)))) { - if(!(key = PRVM_ED_FindField(prog, Cmd_Argv(cmd, i)))) - { - print("Key %s not found!\n", Cmd_Argv(cmd, i)); - PRVM_ED_Free(prog, ed); - return; - } + print("Key %s not found!\n", Cmd_Argv(cmd, i)); + PRVM_ED_Free(prog, ed); + return; + } - /* - * This is mostly for dedicated server console, but if the - * player gave a custom origin, we can ignore the traceline. - */ - if(!strcmp(Cmd_Argv(cmd, i), "origin")) - haveorigin = true; + /* + * This is mostly for dedicated server console, but if the + * player gave a custom origin, we can ignore the traceline. + */ + if(!strcmp(Cmd_Argv(cmd, i), "origin")) + haveorigin = true; - expectval = true; - } - else - { - PRVM_ED_ParseEpair(prog, ed, key, Cmd_Argv(cmd, i), false); - expectval = false; - } + if (i + 1 < Cmd_Argc(cmd)) + PRVM_ED_ParseEpair(prog, ed, key, Cmd_Argv(cmd, i+1), false); } if(!haveorigin) @@ -1589,7 +1509,7 @@ static void SV_Ent_Remove_f(cmd_state_t *cmd) { prvm_prog_t *prog = SVVM_prog; prvm_edict_t *ed; - int i, ednum; + int i, ednum = 0; void (*print)(const char *, ...) = (cmd->source == src_client ? SV_ClientPrintf : Con_Printf); if(!Cmd_Argc(cmd)) @@ -1713,11 +1633,9 @@ void SV_InitOperatorCommands(void) Cmd_AddCommand(CF_SHARED, "viewnext", SV_Viewnext_f, "change to next animation frame of viewthing entity in current level"); Cmd_AddCommand(CF_SHARED, "viewprev", SV_Viewprev_f, "change to previous animation frame of viewthing entity in current level"); Cmd_AddCommand(CF_SHARED, "maxplayers", SV_MaxPlayers_f, "sets limit on how many players (or bots) may be connected to the server at once"); - Cmd_AddCommand(CF_SHARED, "user", SV_User_f, "prints additional information about a player number or name on the scoreboard"); - Cmd_AddCommand(CF_SHARED, "users", SV_Users_f, "prints additional information about all players on the scoreboard"); - Cmd_AddCommand(CF_SERVER, "sendcvar", SV_SendCvar_f, "sends the value of a cvar to the server as a sentcvar command, for use by QuakeC"); + host.hook.SV_SendCvar = SV_SendCvar_f; - // commands that do not have automatic forwarding from cmd_client, these are internal details of the network protocol and not of interest to users (if they know what they are doing they can still use a generic "cmd prespawn" or similar) + // commands that do not have automatic forwarding from cmd_local, these are internal details of the network protocol and not of interest to users (if they know what they are doing they can still use a generic "cmd prespawn" or similar) Cmd_AddCommand(CF_SERVER_FROM_CLIENT, "prespawn", SV_PreSpawn_f, "internal use - signon 1 (client acknowledges that server information has been received)"); Cmd_AddCommand(CF_SERVER_FROM_CLIENT, "spawn", SV_Spawn_f, "internal use - signon 2 (client has sent player information, and is asking server to send scoreboard rankings)"); Cmd_AddCommand(CF_SERVER_FROM_CLIENT, "begin", SV_Begin_f, "internal use - signon 3 (client asks server to start sending entities, and will go to signon 4 (playing) when the first entity update is received)");