cvar_t sv_cheats = {0, "sv_cheats", "0"};
qboolean allowcheats = false;
-mfunction_t *ED_FindFunction (char *name);
-
/*
==================
Host_Quit_f
*/
void Host_Status_f (void)
{
- const char *protocolname;
client_t *client;
int seconds, minutes, hours = 0, j, players;
void (*print) (const char *fmt, ...);
for (players = 0, j = 0;j < svs.maxclients;j++)
if (svs.clients[j].active)
players++;
- print ("host: %s\n", Cvar_VariableString ("hostname"));
- print ("version: %s build %s\n", gamename, buildstring);
- switch(sv.protocol)
- {
- case PROTOCOL_QUAKE: protocolname = sv.netquakecompatible ? "QUAKE" : "QUAKEDP";break;
- case PROTOCOL_DARKPLACES1: protocolname = "PROTOCOL_DARKPLACES1";break;
- case PROTOCOL_DARKPLACES2: protocolname = "PROTOCOL_DARKPLACES2";break;
- case PROTOCOL_DARKPLACES3: protocolname = "PROTOCOL_DARKPLACES3";break;
- case PROTOCOL_DARKPLACES4: protocolname = "PROTOCOL_DARKPLACES4";break;
- case PROTOCOL_DARKPLACES5: protocolname = "PROTOCOL_DARKPLACES5";break;
- case PROTOCOL_DARKPLACES6: protocolname = "PROTOCOL_DARKPLACES6";break;
- default: protocolname = "PROTOCOL_UNKNOWN";break;
- }
- print ("protocol: %i (%s)\n", sv.protocol, protocolname);
- print ("map: %s\n", sv.name);
- print ("players: %i active (%i max)\n\n", players, svs.maxclients);
+ print ("host: %s\n", Cvar_VariableString ("hostname"));
+ print ("version: %s build %s\n", gamename, buildstring);
+ print ("protocol: %i (%s)\n", Protocol_NumberForEnum(sv.protocol), Protocol_NameForEnum(sv.protocol));
+ print ("map: %s\n", sv.name);
+ print ("players: %i active (%i max)\n\n", players, svs.maxclients);
for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++)
{
if (!client->active)
}
else
hours = 0;
- print ("#%-2u %-16.16s %3i %2i:%02i:%02i\n", j+1, client->name, (int)client->edict->v->frags, hours, minutes, seconds);
+ print ("#%-2u %-16.16s %3i %2i:%02i:%02i\n", j+1, client->name, (int)client->edict->fields.server->frags, hours, minutes, seconds);
print (" %s\n", client->netconnection ? client->netconnection->address : "botclient");
}
}
return;
}
- host_client->edict->v->flags = (int)host_client->edict->v->flags ^ FL_GODMODE;
- if (!((int)host_client->edict->v->flags & FL_GODMODE) )
+ host_client->edict->fields.server->flags = (int)host_client->edict->fields.server->flags ^ FL_GODMODE;
+ if (!((int)host_client->edict->fields.server->flags & FL_GODMODE) )
SV_ClientPrint("godmode OFF\n");
else
SV_ClientPrint("godmode ON\n");
return;
}
- host_client->edict->v->flags = (int)host_client->edict->v->flags ^ FL_NOTARGET;
- if (!((int)host_client->edict->v->flags & FL_NOTARGET) )
+ host_client->edict->fields.server->flags = (int)host_client->edict->fields.server->flags ^ FL_NOTARGET;
+ if (!((int)host_client->edict->fields.server->flags & FL_NOTARGET) )
SV_ClientPrint("notarget OFF\n");
else
SV_ClientPrint("notarget ON\n");
return;
}
- if (host_client->edict->v->movetype != MOVETYPE_NOCLIP)
+ if (host_client->edict->fields.server->movetype != MOVETYPE_NOCLIP)
{
noclip_anglehack = true;
- host_client->edict->v->movetype = MOVETYPE_NOCLIP;
+ host_client->edict->fields.server->movetype = MOVETYPE_NOCLIP;
SV_ClientPrint("noclip ON\n");
}
else
{
noclip_anglehack = false;
- host_client->edict->v->movetype = MOVETYPE_WALK;
+ host_client->edict->fields.server->movetype = MOVETYPE_WALK;
SV_ClientPrint("noclip OFF\n");
}
}
return;
}
- if (host_client->edict->v->movetype != MOVETYPE_FLY)
+ if (host_client->edict->fields.server->movetype != MOVETYPE_FLY)
{
- host_client->edict->v->movetype = MOVETYPE_FLY;
+ host_client->edict->fields.server->movetype = MOVETYPE_FLY;
SV_ClientPrint("flymode ON\n");
}
else
{
- host_client->edict->v->movetype = MOVETYPE_WALK;
+ host_client->edict->fields.server->movetype = MOVETYPE_WALK;
SV_ClientPrint("flymode OFF\n");
}
}
*/
void Host_Ping_f (void)
{
- int i, j;
- float total;
+ int i;
client_t *client;
if (cmd_source == src_command)
{
if (!client->active)
continue;
- total = 0;
- for (j=0 ; j<NUM_PING_TIMES ; j++)
- total+=client->ping_times[j];
- total /= NUM_PING_TIMES;
- SV_ClientPrintf("%4i %s\n", (int)(total*1000), client->name);
+ SV_ClientPrintf("%4i %s\n", (int)floor(client->ping*1000+0.5), client->name);
}
}
strcpy(level, Cmd_Argv(1));
SV_SpawnServer(level);
if (sv.active && cls.state == ca_disconnected)
+ {
+ SV_VM_Begin();
CL_EstablishConnection("local:1");
+ SV_VM_End();
+ }
}
/*
void Host_Changelevel_f (void)
{
char level[MAX_QPATH];
-
+
if (Cmd_Argc() != 2)
{
Con_Print("changelevel <levelname> : continue game on a new level\n");
return;
}
- if (!sv.active || cls.demoplayback)
+ // HACKHACKHACK
+ if (!sv.active) {
+ Host_Map_f();
+ return;
+ }
+ if (cls.demoplayback)
{
Con_Print("Only the server may changelevel\n");
return;
key_dest = key_game;
key_consoleactive = 0;
+ SV_VM_Begin();
SV_SaveSpawnparms ();
+ SV_VM_End();
allowcheats = sv_cheats.integer != 0;
strcpy(level, Cmd_Argv(1));
SV_SpawnServer(level);
if (sv.active && cls.state == ca_disconnected)
+ {
+ SV_VM_Begin();
CL_EstablishConnection("local:1");
+ SV_VM_End();
+ }
}
/*
void Host_Restart_f (void)
{
char mapname[MAX_QPATH];
-
+
if (Cmd_Argc() != 1)
{
Con_Print("restart : restart current level\n");
strcpy(mapname, sv.name);
SV_SpawnServer(mapname);
if (sv.active && cls.state == ca_disconnected)
+ {
+ SV_VM_Begin();
CL_EstablishConnection("local:1");
+ SV_VM_End();
+ }
}
/*
*/
void Host_Reconnect_f (void)
{
+ if (cmd_source == src_command)
+ {
+ Con_Print("reconnect is not valid from the console\n");
+ return;
+ }
if (Cmd_Argc() != 1)
{
Con_Print("reconnect : wait for signon messages again\n");
Con_Print("connect <serveraddress> : connect to a multiplayer game\n");
return;
}
- CL_EstablishConnection(Cmd_Argv(1));
+ if( sv.active ) {
+ SV_VM_Begin();
+ CL_EstablishConnection(Cmd_Argv(1));
+ SV_VM_End();
+ } else {
+ CL_EstablishConnection(Cmd_Argv(1));
+ }
}
for (i=0 ; i<SAVEGAME_COMMENT_LENGTH ; i++)
text[i] = ' ';
- memcpy (text, cl.levelname, strlen(cl.levelname));
+ // LordHavoc: added min() to prevent overflow
+ memcpy (text, cl.levelname, min(strlen(cl.levelname), SAVEGAME_COMMENT_LENGTH));
sprintf (kills,"kills:%3i/%3i", cl.stats[STAT_MONSTERS], cl.stats[STAT_TOTALMONSTERS]);
memcpy (text+22, kills, strlen(kills));
-// convert space to _ to make stdio happy
+ // convert space to _ to make stdio happy
+ // LordHavoc: convert control characters to _ as well
for (i=0 ; i<SAVEGAME_COMMENT_LENGTH ; i++)
- if (text[i] == ' ')
+ if (text[i] <= ' ')
text[i] = '_';
text[SAVEGAME_COMMENT_LENGTH] = '\0';
}
Con_Print("Can't save multiplayer games.\n");
return;
}
- if (svs.clients[i].edict->v->deadflag)
+ if (svs.clients[i].edict->fields.server->deadflag)
{
Con_Print("Can't savegame with a dead player\n");
return;
FS_DefaultExtension (name, ".sav", sizeof (name));
Con_Printf("Saving game to %s...\n", name);
- f = FS_Open (name, "w", false);
+ f = FS_Open (name, "wb", false, false);
if (!f)
{
Con_Print("ERROR: couldn't open.\n");
FS_Printf(f, "%s\n", sv.name);
FS_Printf(f, "%f\n",sv.time);
-// write the light styles
-
+ // write the light styles
for (i=0 ; i<MAX_LIGHTSTYLES ; i++)
{
- if (sv.lightstyles[i])
+ if (sv.lightstyles[i][0])
FS_Printf(f, "%s\n", sv.lightstyles[i]);
else
FS_Print(f,"m\n");
}
+ SV_VM_Begin();
+
+ PRVM_ED_WriteGlobals (f);
+ for (i=0 ; i<prog->num_edicts ; i++)
+ PRVM_ED_Write (f, PRVM_EDICT_NUM(i));
+
+ SV_VM_End();
- ED_WriteGlobals (f);
- for (i=0 ; i<sv.num_edicts ; i++)
- {
- ED_Write (f, EDICT_NUM(i));
- FS_Flush (f);
- }
FS_Close (f);
Con_Print("done.\n");
}
-extern mempool_t *edictstring_mempool;
-
/*
===============
Host_Loadgame_f
*/
void Host_Loadgame_f (void)
{
- qfile_t *f;
char filename[MAX_QPATH];
char mapname[MAX_QPATH];
- float time, tfloat;
- char buf[32768];
+ float time;
const char *start;
- char *str;
- int i, r;
- edict_t *ent;
+ const char *t;
+ char *text;
+ prvm_edict_t *ent;
+ int i;
int entnum;
int version;
float spawn_parms[NUM_SPAWN_PARMS];
cls.demonum = -1; // stop demo loop in case this fails
- f = FS_Open (filename, "r", false);
- if (!f)
+ t = text = (char *)FS_LoadFile (filename, tempmempool, false, NULL);
+ if (!text)
{
Con_Print("ERROR: couldn't open.\n");
return;
}
- str = FS_Getline (f);
- sscanf (str, "%i\n", &version);
+ // version
+ COM_ParseToken(&t, false);
+ version = atoi(com_token);
if (version != SAVEGAME_VERSION)
{
- FS_Close (f);
+ Mem_Free(text);
Con_Printf("Savegame is version %i, not %i\n", version, SAVEGAME_VERSION);
return;
}
- str = FS_Getline (f);
+ // description
+ // this is a little hard to parse, as : is a separator in COM_ParseToken,
+ // so use the console parser instead
+ COM_ParseTokenConsole(&t);
+
for (i = 0;i < NUM_SPAWN_PARMS;i++)
{
- str = FS_Getline (f);
- sscanf (str, "%f\n", &spawn_parms[i]);
+ COM_ParseToken(&t, false);
+ spawn_parms[i] = atof(com_token);
}
+ // skill
+ COM_ParseToken(&t, false);
// this silliness is so we can load 1.06 save files, which have float skill values
- str = FS_Getline (f);
- sscanf (str, "%f\n", &tfloat);
- current_skill = (int)(tfloat + 0.1);
+ current_skill = (int)(atof(com_token) + 0.5);
Cvar_SetValue ("skill", (float)current_skill);
- strcpy (mapname, FS_Getline (f));
+ // mapname
+ COM_ParseToken(&t, false);
+ strcpy (mapname, com_token);
- str = FS_Getline (f);
- sscanf (str, "%f\n",&time);
+ // time
+ COM_ParseToken(&t, false);
+ time = atof(com_token);
allowcheats = sv_cheats.integer != 0;
+
SV_SpawnServer (mapname);
if (!sv.active)
{
+ Mem_Free(text);
Con_Print("Couldn't load map\n");
return;
}
for (i = 0;i < MAX_LIGHTSTYLES;i++)
{
- str = FS_Getline (f);
- sv.lightstyles[i] = Mem_Alloc(edictstring_mempool, strlen(str)+1);
- strcpy (sv.lightstyles[i], str);
+ // light style
+ COM_ParseToken(&t, false);
+ strlcpy(sv.lightstyles[i], com_token, sizeof(sv.lightstyles[i]));
}
// load the edicts out of the savegame file
+ SV_VM_Begin();
// -1 is the globals
entnum = -1;
for (;;)
{
- r = EOF;
- for (i = 0;i < (int)sizeof(buf) - 1;i++)
- {
- r = FS_Getc (f);
- if (r == EOF || !r)
+ start = t;
+ while (COM_ParseToken(&t, false))
+ if (!strcmp(com_token, "}"))
break;
- buf[i] = r;
- if (r == '}')
- {
- i++;
- break;
- }
- }
- if (r == EOF)
- break;
- if (i == sizeof(buf)-1)
- Host_Error ("Loadgame buffer overflow");
- buf[i] = 0;
- start = buf;
if (!COM_ParseToken(&start, false))
{
// end of file
break;
}
if (strcmp(com_token,"{"))
+ {
+ Mem_Free(text);
Host_Error ("First token isn't a brace");
+ }
if (entnum == -1)
{
// parse the global vars
- ED_ParseGlobals (start);
+ PRVM_ED_ParseGlobals (start);
}
else
{
// parse an edict
if (entnum >= MAX_EDICTS)
- Host_Error("Host_PerformLoadGame: too many edicts in save file (reached MAX_EDICTS %i)\n", MAX_EDICTS);
- while (entnum >= sv.max_edicts)
- SV_IncreaseEdicts();
- ent = EDICT_NUM(entnum);
- memset (ent->v, 0, progs->entityfields * 4);
- ent->e->free = false;
- ED_ParseEdict (start, ent);
+ {
+ Mem_Free(text);
+ Host_Error("Host_PerformLoadGame: too many edicts in save file (reached MAX_EDICTS %i)", MAX_EDICTS);
+ }
+ while (entnum >= prog->max_edicts)
+ //SV_IncreaseEdicts();
+ PRVM_MEM_IncreaseEdicts();
+ ent = PRVM_EDICT_NUM(entnum);
+ memset (ent->fields.server, 0, prog->progs->entityfields * 4);
+ ent->priv.server->free = false;
+ PRVM_ED_ParseEdict (start, ent);
// link it into the bsp tree
- if (!ent->e->free)
+ if (!ent->priv.server->free)
SV_LinkEdict (ent, false);
}
entnum++;
}
- sv.num_edicts = entnum;
+ prog->num_edicts = entnum;
sv.time = time;
- FS_Close (f);
-
for (i = 0;i < NUM_SPAWN_PARMS;i++)
svs.clients[0].spawn_parms[i] = spawn_parms[i];
// make sure we're connected to loopback
if (cls.state == ca_disconnected || !(cls.state == ca_connected && cls.netcon != NULL && LHNETADDRESS_GetAddressType(&cls.netcon->peeraddress) == LHNETADDRESSTYPE_LOOP))
CL_EstablishConnection("local:1");
+
+ SV_VM_End();
}
//============================================================================
SV_ClientPrintf("You can't change name more than once every 5 seconds!\n");
return;
}
-
+
host_client->nametime = sv.time + 5;
// point the string back at updateclient->name to keep it safe
strlcpy (host_client->name, newName, sizeof (host_client->name));
- host_client->edict->v->netname = PR_SetString(host_client->name);
+ host_client->edict->fields.server->netname = PRVM_SetEngineString(host_client->name);
if (strcmp(host_client->old_name, host_client->name))
{
if (host_client->spawned)
Host_Playermodel_f
======================
*/
-cvar_t cl_playermodel = {CVAR_SAVE, "_cl_playermodel", ""};
+cvar_t cl_playermodel = {CVAR_SAVE, "_cl_playermodel", ""};
// the old cl_playermodel in cl_main has been renamed to __cl_playermodel
void Host_Playermodel_f (void)
{
SV_ClientPrintf("You can't change playermodel more than once every 5 seconds!\n");
return;
}
-
+
host_client->nametime = sv.time + 5;
*/
// point the string back at updateclient->name to keep it safe
strlcpy (host_client->playermodel, newPath, sizeof (host_client->playermodel));
if( eval_playermodel )
- GETEDICTFIELDVALUE(host_client->edict, eval_playermodel)->string = PR_SetString(host_client->playermodel);
+ PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_playermodel)->string = PRVM_SetEngineString(host_client->playermodel);
if (strcmp(host_client->old_model, host_client->playermodel))
{
- if (host_client->spawned)
- SV_BroadcastPrintf("%s changed model to %s\n", host_client->old_model, host_client->playermodel);
strcpy(host_client->old_model, host_client->playermodel);
/*// send notification to all clients
MSG_WriteByte (&sv.reliable_datagram, svc_updatepmodel);
SV_ClientPrintf("You can't change playermodel more than once every 5 seconds!\n");
return;
}
-
+
host_client->nametime = sv.time + 5;
*/
// point the string back at updateclient->name to keep it safe
strlcpy (host_client->playerskin, newPath, sizeof (host_client->playerskin));
if( eval_playerskin )
- GETEDICTFIELDVALUE(host_client->edict, eval_playerskin)->string = PR_SetString(host_client->playerskin);
+ PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_playerskin)->string = PRVM_SetEngineString(host_client->playerskin);
if (strcmp(host_client->old_skin, host_client->playerskin))
{
if (host_client->spawned)
- SV_BroadcastPrintf("%s changed skin to %s\n", host_client->old_skin, host_client->playerskin);
+ SV_BroadcastPrintf("%s changed skin to %s\n", host_client->name, host_client->playerskin);
strcpy(host_client->old_skin, host_client->playerskin);
/*// send notification to all clients
MSG_WriteByte (&sv.reliable_datagram, svc_updatepskin);
const char *p1;
char *p2;
// LordHavoc: 256 char say messages
- unsigned char text[256];
+ char text[256];
qboolean fromServer = false;
if (cmd_source == src_command)
p1++;
}
if (!fromServer)
- snprintf (text, sizeof(text), "%c%s: %s", 1, host_client->name, p1);
+ dpsnprintf (text, sizeof(text), "%c%s" STRING_COLOR_DEFAULT_STR ": %s", 1, host_client->name, p1);
else
- snprintf (text, sizeof(text), "%c<%s> %s", 1, hostname.string, p1);
+ dpsnprintf (text, sizeof(text), "%c<%s" STRING_COLOR_DEFAULT_STR "> %s", 1, hostname.string, p1);
p2 = text + strlen(text);
while ((const char *)p2 > (const char *)text && (p2[-1] == '\r' || p2[-1] == '\n' || (p2[-1] == '\"' && quoted)))
{
// note: save is not a valid edict if fromServer is true
save = host_client;
for (j = 0, host_client = svs.clients;j < svs.maxclients;j++, host_client++)
- if (host_client->spawned && (!teamonly || host_client->edict->v->team == save->edict->v->team))
+ if (host_client->spawned && (!teamonly || host_client->edict->fields.server->team == save->edict->fields.server->team))
SV_ClientPrint(text);
host_client = save;
- //Con_Print(&text[1]);
+ if (cls.state == ca_dedicated)
+ Con_Print(&text[1]);
}
}
while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r'))
p2--;
- for (j = strlen(text);j < (int)(sizeof(text) - 2) && p1 < p2;)
+ for (j = (int)strlen(text);j < (int)(sizeof(text) - 2) && p1 < p2;)
text[j++] = *p1++;
text[j++] = '\n';
text[j++] = 0;
return;
}
- if (host_client->edict && (f = ED_FindFunction ("SV_ChangeTeam")) && (SV_ChangeTeam = (func_t)(f - pr_functions)))
+ if (host_client->edict && (f = PRVM_ED_FindFunction ("SV_ChangeTeam")) && (SV_ChangeTeam = (func_t)(f - prog->functions)))
{
Con_DPrint("Calling SV_ChangeTeam\n");
- pr_global_struct->time = sv.time;
- pr_globals[OFS_PARM0] = playercolor;
- pr_global_struct->self = EDICT_TO_PROG(host_client->edict);
- PR_ExecuteProgram (SV_ChangeTeam, "QC function SV_ChangeTeam is missing");
+ prog->globals.server->time = sv.time;
+ prog->globals.generic[OFS_PARM0] = playercolor;
+ prog->globals.server->self = PRVM_EDICT_TO_PROG(host_client->edict);
+ PRVM_ExecuteProgram (SV_ChangeTeam, "QC function SV_ChangeTeam is missing");
}
else
{
- eval_t *val;
+ prvm_eval_t *val;
if (host_client->edict)
{
- if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_clientcolors)))
+ if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_clientcolors)))
val->_float = playercolor;
- host_client->edict->v->team = bottom + 1;
+ host_client->edict->fields.server->team = bottom + 1;
}
host_client->colors = playercolor;
if (host_client->old_colors != host_client->colors)
return;
}
- if (host_client->edict->v->health <= 0)
+ if (host_client->edict->fields.server->health <= 0)
{
SV_ClientPrint("Can't suicide -- already dead!\n");
return;
}
- pr_global_struct->time = sv.time;
- pr_global_struct->self = EDICT_TO_PROG(host_client->edict);
- PR_ExecuteProgram (pr_global_struct->ClientKill, "QC function ClientKill is missing");
+ prog->globals.server->time = sv.time;
+ prog->globals.server->self = PRVM_EDICT_TO_PROG(host_client->edict);
+ PRVM_ExecuteProgram (prog->globals.server->ClientKill, "QC function ClientKill is missing");
}
======================
Host_PModel_f
LordHavoc: only supported for Nehahra, I personally think this is dumb, but Mindcrime won't listen.
+LordHavoc: correction, Mindcrime will be removing pmodel in the future, but it's still stuck here for compatibility.
======================
*/
cvar_t cl_pmodel = {CVAR_SAVE, "_cl_pmodel", "0"};
static void Host_PModel_f (void)
{
int i;
- eval_t *val;
+ prvm_eval_t *val;
if (Cmd_Argc () == 1)
{
return;
}
- if (host_client->edict && (val = GETEDICTFIELDVALUE(host_client->edict, eval_pmodel)))
+ if (host_client->edict && (val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_pmodel)))
val->_float = i;
}
// if this is the last client to be connected, unpause
sv.paused = false;
- if ((f = ED_FindFunction ("RestoreGame")))
- if ((RestoreGame = (func_t)(f - pr_functions)))
+ if ((f = PRVM_ED_FindFunction ("RestoreGame")))
+ if ((RestoreGame = (func_t)(f - prog->functions)))
{
Con_DPrint("Calling RestoreGame\n");
- pr_global_struct->time = sv.time;
- pr_global_struct->self = EDICT_TO_PROG(host_client->edict);
- PR_ExecuteProgram (RestoreGame, "QC function RestoreGame is missing");
+ prog->globals.server->time = sv.time;
+ prog->globals.server->self = PRVM_EDICT_TO_PROG(host_client->edict);
+ PRVM_ExecuteProgram (RestoreGame, "QC function RestoreGame is missing");
}
}
else
{
// set up the edict
- ED_ClearEdict(host_client->edict);
+ PRVM_ED_ClearEdict(host_client->edict);
- //Con_Printf("Host_Spawn_f: host_client->edict->netname = %s, host_client->edict->netname = %s, host_client->name = %s\n", PR_GetString(host_client->edict->v->netname), PR_GetString(host_client->edict->v->netname), host_client->name);
+ //Con_Printf("Host_Spawn_f: host_client->edict->netname = %s, host_client->edict->netname = %s, host_client->name = %s\n", PRVM_GetString(host_client->edict->fields.server->netname), PRVM_GetString(host_client->edict->fields.server->netname), host_client->name);
// copy spawn parms out of the client_t
for (i=0 ; i< NUM_SPAWN_PARMS ; i++)
- (&pr_global_struct->parm1)[i] = host_client->spawn_parms[i];
+ (&prog->globals.server->parm1)[i] = host_client->spawn_parms[i];
// call the spawn function
- pr_global_struct->time = sv.time;
- pr_global_struct->self = EDICT_TO_PROG(host_client->edict);
- PR_ExecuteProgram (pr_global_struct->ClientConnect, "QC function ClientConnect is missing");
+ host_client->clientconnectcalled = true;
+ prog->globals.server->time = sv.time;
+ prog->globals.server->self = PRVM_EDICT_TO_PROG(host_client->edict);
+ PRVM_ExecuteProgram (prog->globals.server->ClientConnect, "QC function ClientConnect is missing");
if ((Sys_DoubleTime() - host_client->connecttime) <= sv.time)
Con_Printf("%s entered the game\n", host_client->name);
- PR_ExecuteProgram (pr_global_struct->PutClientInServer, "QC function PutClientInServer is missing");
+ PRVM_ExecuteProgram (prog->globals.server->PutClientInServer, "QC function PutClientInServer is missing");
}
// send all current light styles
for (i=0 ; i<MAX_LIGHTSTYLES ; i++)
{
- MSG_WriteByte (&host_client->message, svc_lightstyle);
- MSG_WriteByte (&host_client->message, (char)i);
- MSG_WriteString (&host_client->message, sv.lightstyles[i]);
+ if (sv.lightstyles[i][0])
+ {
+ MSG_WriteByte (&host_client->message, svc_lightstyle);
+ MSG_WriteByte (&host_client->message, (char)i);
+ MSG_WriteString (&host_client->message, sv.lightstyles[i]);
+ }
}
// send some stats
MSG_WriteByte (&host_client->message, svc_updatestat);
MSG_WriteByte (&host_client->message, STAT_TOTALSECRETS);
- MSG_WriteLong (&host_client->message, pr_global_struct->total_secrets);
+ MSG_WriteLong (&host_client->message, prog->globals.server->total_secrets);
MSG_WriteByte (&host_client->message, svc_updatestat);
MSG_WriteByte (&host_client->message, STAT_TOTALMONSTERS);
- MSG_WriteLong (&host_client->message, pr_global_struct->total_monsters);
+ MSG_WriteLong (&host_client->message, prog->globals.server->total_monsters);
MSG_WriteByte (&host_client->message, svc_updatestat);
MSG_WriteByte (&host_client->message, STAT_SECRETS);
- MSG_WriteLong (&host_client->message, pr_global_struct->found_secrets);
+ MSG_WriteLong (&host_client->message, prog->globals.server->found_secrets);
MSG_WriteByte (&host_client->message, svc_updatestat);
MSG_WriteByte (&host_client->message, STAT_MONSTERS);
- MSG_WriteLong (&host_client->message, pr_global_struct->killed_monsters);
+ MSG_WriteLong (&host_client->message, prog->globals.server->killed_monsters);
// send a fixangle
// Never send a roll angle, because savegames can catch the server
// and it won't happen if the game was just loaded, so you wind up
// with a permanent head tilt
MSG_WriteByte (&host_client->message, svc_setangle);
- MSG_WriteAngle (&host_client->message, host_client->edict->v->angles[0], sv.protocol);
- MSG_WriteAngle (&host_client->message, host_client->edict->v->angles[1], sv.protocol);
+ MSG_WriteAngle (&host_client->message, host_client->edict->fields.server->angles[0], sv.protocol);
+ MSG_WriteAngle (&host_client->message, host_client->edict->fields.server->angles[1], sv.protocol);
MSG_WriteAngle (&host_client->message, 0, sv.protocol);
SV_WriteClientdataToMessage (host_client, host_client->edict, &host_client->message, stats);
if (cmd_source != src_command || !sv.active)
return;
+ SV_VM_Begin();
save = host_client;
if (Cmd_Argc() > 2 && strcmp(Cmd_Argv(1), "#") == 0)
}
host_client = save;
+ SV_VM_End();
}
/*
{
const char *t;
int v;
- eval_t *val;
+ prvm_eval_t *val;
if (cmd_source == src_command)
{
if (t[0] == '6')
{
if (t[1] == 'a')
- host_client->edict->v->items = (int)host_client->edict->v->items | HIT_PROXIMITY_GUN;
+ host_client->edict->fields.server->items = (int)host_client->edict->fields.server->items | HIT_PROXIMITY_GUN;
else
- host_client->edict->v->items = (int)host_client->edict->v->items | IT_GRENADE_LAUNCHER;
+ host_client->edict->fields.server->items = (int)host_client->edict->fields.server->items | IT_GRENADE_LAUNCHER;
}
else if (t[0] == '9')
- host_client->edict->v->items = (int)host_client->edict->v->items | HIT_LASER_CANNON;
+ host_client->edict->fields.server->items = (int)host_client->edict->fields.server->items | HIT_LASER_CANNON;
else if (t[0] == '0')
- host_client->edict->v->items = (int)host_client->edict->v->items | HIT_MJOLNIR;
+ host_client->edict->fields.server->items = (int)host_client->edict->fields.server->items | HIT_MJOLNIR;
else if (t[0] >= '2')
- host_client->edict->v->items = (int)host_client->edict->v->items | (IT_SHOTGUN << (t[0] - '2'));
+ host_client->edict->fields.server->items = (int)host_client->edict->fields.server->items | (IT_SHOTGUN << (t[0] - '2'));
}
else
{
if (t[0] >= '2')
- host_client->edict->v->items = (int)host_client->edict->v->items | (IT_SHOTGUN << (t[0] - '2'));
+ host_client->edict->fields.server->items = (int)host_client->edict->fields.server->items | (IT_SHOTGUN << (t[0] - '2'));
}
break;
case 's':
- if (gamemode == GAME_ROGUE && (val = GETEDICTFIELDVALUE(host_client->edict, eval_ammo_shells1)))
+ if (gamemode == GAME_ROGUE && (val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_ammo_shells1)))
val->_float = v;
- host_client->edict->v->ammo_shells = v;
+ host_client->edict->fields.server->ammo_shells = v;
break;
case 'n':
if (gamemode == GAME_ROGUE)
{
- if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_ammo_nails1)))
+ if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_ammo_nails1)))
{
val->_float = v;
- if (host_client->edict->v->weapon <= IT_LIGHTNING)
- host_client->edict->v->ammo_nails = v;
+ if (host_client->edict->fields.server->weapon <= IT_LIGHTNING)
+ host_client->edict->fields.server->ammo_nails = v;
}
}
else
{
- host_client->edict->v->ammo_nails = v;
+ host_client->edict->fields.server->ammo_nails = v;
}
break;
case 'l':
if (gamemode == GAME_ROGUE)
{
- val = GETEDICTFIELDVALUE(host_client->edict, eval_ammo_lava_nails);
+ val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_ammo_lava_nails);
if (val)
{
val->_float = v;
- if (host_client->edict->v->weapon > IT_LIGHTNING)
- host_client->edict->v->ammo_nails = v;
+ if (host_client->edict->fields.server->weapon > IT_LIGHTNING)
+ host_client->edict->fields.server->ammo_nails = v;
}
}
break;
case 'r':
if (gamemode == GAME_ROGUE)
{
- val = GETEDICTFIELDVALUE(host_client->edict, eval_ammo_rockets1);
+ val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_ammo_rockets1);
if (val)
{
val->_float = v;
- if (host_client->edict->v->weapon <= IT_LIGHTNING)
- host_client->edict->v->ammo_rockets = v;
+ if (host_client->edict->fields.server->weapon <= IT_LIGHTNING)
+ host_client->edict->fields.server->ammo_rockets = v;
}
}
else
{
- host_client->edict->v->ammo_rockets = v;
+ host_client->edict->fields.server->ammo_rockets = v;
}
break;
case 'm':
if (gamemode == GAME_ROGUE)
{
- val = GETEDICTFIELDVALUE(host_client->edict, eval_ammo_multi_rockets);
+ val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_ammo_multi_rockets);
if (val)
{
val->_float = v;
- if (host_client->edict->v->weapon > IT_LIGHTNING)
- host_client->edict->v->ammo_rockets = v;
+ if (host_client->edict->fields.server->weapon > IT_LIGHTNING)
+ host_client->edict->fields.server->ammo_rockets = v;
}
}
break;
case 'h':
- host_client->edict->v->health = v;
+ host_client->edict->fields.server->health = v;
break;
case 'c':
if (gamemode == GAME_ROGUE)
{
- val = GETEDICTFIELDVALUE(host_client->edict, eval_ammo_cells1);
+ val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_ammo_cells1);
if (val)
{
val->_float = v;
- if (host_client->edict->v->weapon <= IT_LIGHTNING)
- host_client->edict->v->ammo_cells = v;
+ if (host_client->edict->fields.server->weapon <= IT_LIGHTNING)
+ host_client->edict->fields.server->ammo_cells = v;
}
}
else
{
- host_client->edict->v->ammo_cells = v;
+ host_client->edict->fields.server->ammo_cells = v;
}
break;
case 'p':
if (gamemode == GAME_ROGUE)
{
- val = GETEDICTFIELDVALUE(host_client->edict, eval_ammo_plasma);
+ val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_ammo_plasma);
if (val)
{
val->_float = v;
- if (host_client->edict->v->weapon > IT_LIGHTNING)
- host_client->edict->v->ammo_cells = v;
+ if (host_client->edict->fields.server->weapon > IT_LIGHTNING)
+ host_client->edict->fields.server->ammo_cells = v;
}
}
break;
}
}
-edict_t *FindViewthing (void)
+prvm_edict_t *FindViewthing (void)
{
int i;
- edict_t *e;
+ prvm_edict_t *e;
- for (i=0 ; i<sv.num_edicts ; i++)
+ for (i=0 ; i<prog->num_edicts ; i++)
{
- e = EDICT_NUM(i);
- if (!strcmp (PR_GetString(e->v->classname), "viewthing"))
+ e = PRVM_EDICT_NUM(i);
+ if (!strcmp (PRVM_GetString(e->fields.server->classname), "viewthing"))
return e;
}
Con_Print("No viewthing on map\n");
*/
void Host_Viewmodel_f (void)
{
- edict_t *e;
+ prvm_edict_t *e;
model_t *m;
+ if (!sv.active)
+ return;
+
+ SV_VM_Begin();
e = FindViewthing ();
+ SV_VM_End();
if (!e)
return;
m = Mod_ForName (Cmd_Argv(1), false, true, false);
- if (!m)
+ if (!m || !m->loaded || !m->Draw)
{
- Con_Printf("Can't load %s\n", Cmd_Argv(1));
+ Con_Printf("viewmodel: can't load %s\n", Cmd_Argv(1));
return;
}
- e->v->frame = 0;
- cl.model_precache[(int)e->v->modelindex] = m;
+ e->fields.server->frame = 0;
+ cl.model_precache[(int)e->fields.server->modelindex] = m;
}
/*
*/
void Host_Viewframe_f (void)
{
- edict_t *e;
+ prvm_edict_t *e;
int f;
model_t *m;
+ if (!sv.active)
+ return;
+
+ SV_VM_Begin();
e = FindViewthing ();
+ SV_VM_End();
if (!e)
return;
- m = cl.model_precache[(int)e->v->modelindex];
+ m = cl.model_precache[(int)e->fields.server->modelindex];
f = atoi(Cmd_Argv(1));
if (f >= m->numframes)
f = m->numframes-1;
- e->v->frame = f;
+ e->fields.server->frame = f;
}
*/
void Host_Viewnext_f (void)
{
- edict_t *e;
+ prvm_edict_t *e;
model_t *m;
+ if (!sv.active)
+ return;
+
+ SV_VM_Begin();
e = FindViewthing ();
+ SV_VM_End();
if (!e)
return;
- m = cl.model_precache[(int)e->v->modelindex];
+ m = cl.model_precache[(int)e->fields.server->modelindex];
- e->v->frame = e->v->frame + 1;
- if (e->v->frame >= m->numframes)
- e->v->frame = m->numframes - 1;
+ e->fields.server->frame = e->fields.server->frame + 1;
+ if (e->fields.server->frame >= m->numframes)
+ e->fields.server->frame = m->numframes - 1;
- PrintFrameName (m, e->v->frame);
+ PrintFrameName (m, e->fields.server->frame);
}
/*
*/
void Host_Viewprev_f (void)
{
- edict_t *e;
+ prvm_edict_t *e;
model_t *m;
+ if (!sv.active)
+ return;
+
+ SV_VM_Begin();
e = FindViewthing ();
+ SV_VM_End();
if (!e)
return;
- m = cl.model_precache[(int)e->v->modelindex];
+ m = cl.model_precache[(int)e->fields.server->modelindex];
- e->v->frame = e->v->frame - 1;
- if (e->v->frame < 0)
- e->v->frame = 0;
+ e->fields.server->frame = e->fields.server->frame - 1;
+ if (e->fields.server->frame < 0)
+ e->fields.server->frame = 0;
- PrintFrameName (m, e->v->frame);
+ PrintFrameName (m, e->fields.server->frame);
}
/*
{
int i, c;
- if (cls.state == ca_dedicated || COM_CheckParm("-listen"))
+ if (cls.state == ca_dedicated || COM_CheckParm("-listen") || COM_CheckParm("-benchmark") || COM_CheckParm("-demo") || COM_CheckParm("-demolooponly"))
return;
c = Cmd_Argc() - 1;
if (svs.clients)
Mem_Free(svs.clients);
svs.maxclients = n;
- svs.clients = Mem_Alloc(sv_clients_mempool, sizeof(client_t) * svs.maxclients);
+ svs.clients = (client_t *)Mem_Alloc(sv_mempool, sizeof(client_t) * svs.maxclients);
if (n == 1)
Cvar_Set ("deathmatch", "0");
else
projects / xonotic / darkplaces.git / blobdiff