X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=svvm_cmds.c;h=e17c24ea7feb7646d1f668204b3d61441d340358;hp=d2ad2d817ef653450ee483a5541cb6dd95f7d672;hb=8d2492ac4364e1a51e7f84c6ea1c34429f060939;hpb=4ca9cdd79f030a5cae2b073c9b5c8c740ed2c2bd

diff --git a/svvm_cmds.c b/svvm_cmds.c
index d2ad2d81..e17c24ea 100644
--- a/svvm_cmds.c
+++ b/svvm_cmds.c
@@ -2359,7 +2359,7 @@ static void VM_SV_clientcommand(prvm_prog_t *prog)
 
 	temp_client = host_client;
 	host_client = svs.clients + i;
-	Cmd_ExecuteString(&cmd_serverfromclient, PRVM_G_STRING(OFS_PARM1), src_client, true);
+	Cmd_ExecuteString(cmd_serverfromclient, PRVM_G_STRING(OFS_PARM1), src_client, true);
 	host_client = temp_client;
 }
 
@@ -2853,33 +2853,14 @@ static void VM_SV_pointparticles(prvm_prog_t *prog)
 qbool SV_VM_ConsoleCommand (const char *text)
 {
 	prvm_prog_t *prog = SVVM_prog;
-	int restorevm_tempstringsbuf_cursize;
-	int save_self;
-	qbool r = false;
-
-	if(!sv.active || !prog || !prog->loaded)
-		return false;
-
-	if (PRVM_serverfunction(ConsoleCmd))
-	{
-		save_self = PRVM_serverglobaledict(self);
-		PRVM_serverglobalfloat(time) = sv.time;
-		restorevm_tempstringsbuf_cursize = prog->tempstringsbuf.cursize;
-		PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(sv.world.prog->edicts);
-		PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(prog, text);
-		prog->ExecuteProgram(prog, PRVM_serverfunction(ConsoleCmd), "QC function ConsoleCmd is missing");
-		prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
-		PRVM_serverglobaledict(self) = save_self;
-		r = (int) PRVM_G_FLOAT(OFS_RETURN) != 0;
-	}
-	return r;
+	return PRVM_ConsoleCommand(prog, text, &prog->funcoffsets.ConsoleCmd, true, PRVM_EDICT_TO_PROG(sv.world.prog->edicts), sv.time,  !(!sv.active || !prog || !prog->loaded), "QC function ConsoleCmd is missing"); 
 }
 
 // #352 void(string cmdname) registercommand (EXT_CSQC)
 static void VM_SV_registercommand (prvm_prog_t *prog)
 {
 	VM_SAFEPARMCOUNT(1, VM_SV_registercmd);
-	if(!Cmd_Exists(&cmd_server, PRVM_G_STRING(OFS_PARM0)))
+	if(!Cmd_Exists(cmd_local, PRVM_G_STRING(OFS_PARM0)))
 		Cmd_AddCommand(CF_SERVER, PRVM_G_STRING(OFS_PARM0), NULL, "console command created by QuakeC");
 }
 
@@ -3456,7 +3437,7 @@ NULL,							// #241
 NULL,							// #242
 NULL,							// #243
 NULL,							// #244
-NULL,							// #245
+VM_modulo,						// #245
 NULL,							// #246
 NULL,							// #247
 NULL,							// #248