X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=host_cmd.c;h=b98566f6cea337b98932e0a31f6f2563147f3eff;hp=995e61bc203ee72f5291cd41c1cf0035426d2a70;hb=aa33d8f8642530f7f266d6cde1422f95aa74b2be;hpb=b1b733460d92e4aab49b49dc0190096ba5cc949a;ds=sidebyside diff --git a/host_cmd.c b/host_cmd.c index 995e61bc..b98566f6 100644 --- a/host_cmd.c +++ b/host_cmd.c @@ -24,8 +24,6 @@ int current_skill; cvar_t sv_cheats = {0, "sv_cheats", "0"}; qboolean allowcheats = false; -mfunction_t *ED_FindFunction (char *name); - /* ================== Host_Quit_f @@ -45,7 +43,6 @@ Host_Status_f */ void Host_Status_f (void) { - const char *protocolname; client_t *client; int seconds, minutes, hours = 0, j, players; void (*print) (const char *fmt, ...); @@ -67,18 +64,7 @@ void Host_Status_f (void) 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 ("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++) @@ -96,7 +82,7 @@ void Host_Status_f (void) } 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"); } } @@ -123,8 +109,8 @@ void Host_God_f (void) 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"); @@ -144,8 +130,8 @@ void Host_Notarget_f (void) 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"); @@ -167,16 +153,16 @@ void Host_Noclip_f (void) 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"); } } @@ -202,14 +188,14 @@ void Host_Fly_f (void) 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"); } } @@ -223,8 +209,7 @@ Host_Ping_f */ void Host_Ping_f (void) { - int i, j; - float total; + int i; client_t *client; if (cmd_source == src_command) @@ -238,11 +223,7 @@ void Host_Ping_f (void) { if (!client->active) continue; - total = 0; - for (j=0 ; jping_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); } } @@ -290,7 +271,11 @@ void Host_Map_f (void) 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(); + } } /* @@ -309,7 +294,12 @@ void Host_Changelevel_f (void) Con_Print("changelevel : 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; @@ -321,12 +311,18 @@ void Host_Changelevel_f (void) 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(); + } } /* @@ -361,7 +357,11 @@ void Host_Restart_f (void) strcpy(mapname, sv.name); SV_SpawnServer(mapname); if (sv.active && cls.state == ca_disconnected) + { + SV_VM_Begin(); CL_EstablishConnection("local:1"); + SV_VM_End(); + } } /* @@ -374,6 +374,11 @@ This is sent just before a server changes levels */ 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"); @@ -401,7 +406,13 @@ void Host_Connect_f (void) Con_Print("connect : 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)); + } } @@ -429,12 +440,14 @@ void Host_SavegameComment (char *text) for (i=0 ; iv->deadflag) + if (svs.clients[i].edict->fields.server->deadflag) { Con_Print("Can't savegame with a dead player\n"); return; @@ -500,7 +513,7 @@ void Host_Savegame_f (void) FS_DefaultExtension (name, ".sav", sizeof (name)); Con_Printf("Saving game to %s...\n", name); - f = FS_Open (name, "wb", false); + f = FS_Open (name, "wb", false, false); if (!f) { Con_Print("ERROR: couldn't open.\n"); @@ -519,22 +532,25 @@ void Host_Savegame_f (void) // write the light styles for (i=0 ; inum_edicts ; i++) + PRVM_ED_Write (f, PRVM_EDICT_NUM(i)); + + SV_VM_End(); + FS_Close (f); Con_Print("done.\n"); } -extern mempool_t *edictstring_mempool; - /* =============== Host_Loadgame_f @@ -548,7 +564,7 @@ void Host_Loadgame_f (void) const char *start; const char *t; char *text; - edict_t *ent; + prvm_edict_t *ent; int i; int entnum; int version; @@ -570,7 +586,7 @@ void Host_Loadgame_f (void) cls.demonum = -1; // stop demo loop in case this fails - t = text = FS_LoadFile (filename, tempmempool, false); + t = text = (char *)FS_LoadFile (filename, tempmempool, false); if (!text) { Con_Print("ERROR: couldn't open.\n"); @@ -629,11 +645,11 @@ void Host_Loadgame_f (void) { // light style COM_ParseToken(&t, false); - sv.lightstyles[i] = Mem_Alloc(edictstring_mempool, strlen(com_token)+1); - strcpy (sv.lightstyles[i], com_token); + 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 (;;) @@ -656,7 +672,7 @@ void Host_Loadgame_f (void) if (entnum == -1) { // parse the global vars - ED_ParseGlobals (start); + PRVM_ED_ParseGlobals (start); } else { @@ -666,22 +682,23 @@ void Host_Loadgame_f (void) Mem_Free(text); 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); + 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; for (i = 0;i < NUM_SPAWN_PARMS;i++) @@ -690,6 +707,8 @@ void Host_Loadgame_f (void) // 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(); } //============================================================================ @@ -739,7 +758,7 @@ void Host_Name_f (void) // 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) @@ -801,11 +820,9 @@ void Host_Playermodel_f (void) // 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); @@ -862,11 +879,11 @@ void Host_Playerskin_f (void) // 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); @@ -887,7 +904,7 @@ void Host_Say(qboolean teamonly) 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) @@ -919,9 +936,9 @@ void Host_Say(qboolean teamonly) 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))) { @@ -935,11 +952,12 @@ void Host_Say(qboolean teamonly) // 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]); } @@ -1005,7 +1023,7 @@ void Host_Tell_f(void) } 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; @@ -1065,22 +1083,22 @@ void Host_Color_f(void) 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) @@ -1132,15 +1150,15 @@ void Host_Kill_f (void) 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"); } @@ -1173,13 +1191,14 @@ void Host_Pause_f (void) ====================== 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) { @@ -1198,7 +1217,7 @@ static void Host_PModel_f (void) 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; } @@ -1273,35 +1292,36 @@ void Host_Spawn_f (void) // 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"); } @@ -1335,19 +1355,19 @@ void Host_Spawn_f (void) // 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 @@ -1355,8 +1375,8 @@ void Host_Spawn_f (void) // 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); @@ -1403,6 +1423,7 @@ void Host_Kick_f (void) if (cmd_source != src_command || !sv.active) return; + SV_VM_Begin(); save = host_client; if (Cmd_Argc() > 2 && strcmp(Cmd_Argv(1), "#") == 0) @@ -1461,6 +1482,7 @@ void Host_Kick_f (void) } host_client = save; + SV_VM_End(); } /* @@ -1480,7 +1502,7 @@ void Host_Give_f (void) { const char *t; int v; - eval_t *val; + prvm_eval_t *val; if (cmd_source == src_command) { @@ -1515,128 +1537,128 @@ void Host_Give_f (void) 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 ; inum_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"); @@ -1650,22 +1672,27 @@ Host_Viewmodel_f */ 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; } /* @@ -1675,20 +1702,25 @@ Host_Viewframe_f */ 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; } @@ -1707,19 +1739,24 @@ Host_Viewnext_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); } /* @@ -1729,20 +1766,25 @@ Host_Viewprev_f */ 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); } /* @@ -1763,7 +1805,7 @@ void Host_Startdemos_f (void) { 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; @@ -1846,7 +1888,7 @@ static void MaxPlayers_f(void) 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