X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=host_cmd.c;h=25d861c260d3366328daea7b70a0b5c14e5a1cf0;hp=745503219dcad3f3d3ec0380391d4f2389971f9d;hb=e5004f482e1e5ff6c17e6b9252a0ff1381ce90db;hpb=7d0ec7ce187f7333a7ada2884108757a4fec6449 diff --git a/host_cmd.c b/host_cmd.c index 74550321..25d861c2 100644 --- a/host_cmd.c +++ b/host_cmd.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -20,9 +20,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" -int current_skill; - -void Mod_Print (void); +int current_skill; +char sv_spawnmap[MAX_QPATH]; +char sv_loadgame[MAX_OSPATH]; dfunction_t *ED_FindFunction (char *name); @@ -32,20 +32,12 @@ Host_Quit_f ================== */ -// LordHavoc: didn't like it asking me if I wanted to quit -//extern void M_Menu_Quit_f (void); - +extern qboolean host_shuttingdown; void Host_Quit_f (void) { - /* - if (key_dest != key_console && cls.state != ca_dedicated) - { - M_Menu_Quit_f (); - return; - } - */ + host_shuttingdown = true; CL_Disconnect (); - Host_ShutdownServer(false); + Host_ShutdownServer(false); Sys_Quit (); } @@ -58,13 +50,10 @@ Host_Status_f */ void Host_Status_f (void) { - client_t *client; - int seconds; - int minutes; - int hours = 0; - int j; - void (*print) (char *fmt, ...); - + client_t *client; + int seconds, minutes, hours = 0, j; + void (*print) (const char *fmt, ...); + if (cmd_source == src_command) { if (!sv.active) @@ -78,7 +67,7 @@ void Host_Status_f (void) print = SV_ClientPrintf; print ("host: %s\n", Cvar_VariableString ("hostname")); - print ("version: %4.2f (build %i)\n", VERSION, buildnumber); + print ("version: %s build %s\n", gamename, buildstring); if (tcpipAvailable) print ("tcp/ip: %s\n", my_tcpip_address); if (ipxAvailable) @@ -100,7 +89,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->v->frags, hours, minutes, seconds); print (" %s\n", client->netconnection->address); } } @@ -124,8 +113,8 @@ void Host_God_f (void) if (pr_global_struct->deathmatch) return; - sv_player->v.flags = (int)sv_player->v.flags ^ FL_GODMODE; - if (!((int)sv_player->v.flags & FL_GODMODE) ) + sv_player->v->flags = (int)sv_player->v->flags ^ FL_GODMODE; + if (!((int)sv_player->v->flags & FL_GODMODE) ) SV_ClientPrintf ("godmode OFF\n"); else SV_ClientPrintf ("godmode ON\n"); @@ -142,8 +131,8 @@ void Host_Notarget_f (void) if (pr_global_struct->deathmatch) return; - sv_player->v.flags = (int)sv_player->v.flags ^ FL_NOTARGET; - if (!((int)sv_player->v.flags & FL_NOTARGET) ) + sv_player->v->flags = (int)sv_player->v->flags ^ FL_NOTARGET; + if (!((int)sv_player->v->flags & FL_NOTARGET) ) SV_ClientPrintf ("notarget OFF\n"); else SV_ClientPrintf ("notarget ON\n"); @@ -162,16 +151,16 @@ void Host_Noclip_f (void) if (pr_global_struct->deathmatch) return; - if (sv_player->v.movetype != MOVETYPE_NOCLIP) + if (sv_player->v->movetype != MOVETYPE_NOCLIP) { noclip_anglehack = true; - sv_player->v.movetype = MOVETYPE_NOCLIP; + sv_player->v->movetype = MOVETYPE_NOCLIP; SV_ClientPrintf ("noclip ON\n"); } else { noclip_anglehack = false; - sv_player->v.movetype = MOVETYPE_WALK; + sv_player->v->movetype = MOVETYPE_WALK; SV_ClientPrintf ("noclip OFF\n"); } } @@ -194,14 +183,14 @@ void Host_Fly_f (void) if (pr_global_struct->deathmatch) return; - if (sv_player->v.movetype != MOVETYPE_FLY) + if (sv_player->v->movetype != MOVETYPE_FLY) { - sv_player->v.movetype = MOVETYPE_FLY; + sv_player->v->movetype = MOVETYPE_FLY; SV_ClientPrintf ("flymode ON\n"); } else { - sv_player->v.movetype = MOVETYPE_WALK; + sv_player->v->movetype = MOVETYPE_WALK; SV_ClientPrintf ("flymode OFF\n"); } } @@ -218,7 +207,7 @@ void Host_Ping_f (void) int i, j; float total; client_t *client; - + if (cmd_source == src_command) { Cmd_ForwardToServer (); @@ -246,59 +235,31 @@ SERVER TRANSITIONS =============================================================================== */ - /* ====================== Host_Map_f -handle a +handle a map command from the console. Active clients are kicked off. ====================== */ void Host_Map_f (void) { - int i; - char name[MAX_QPATH]; - if (cmd_source != src_command) return; cls.demonum = -1; // stop demo loop in case this fails -// SCR_BeginLoadingPlaque (); + SCR_BeginLoadingPlaque (); CL_Disconnect (); - Host_ShutdownServer(false); + Host_ShutdownServer(false); key_dest = key_game; // remove console or menu - cls.mapstring[0] = 0; - for (i=0 ; i : continue game on a new level\n"); @@ -323,8 +282,7 @@ void Host_Changelevel_f (void) return; } SV_SaveSpawnparms (); - strcpy (level, Cmd_Argv(1)); - SV_SpawnServer (level); + strcpy (sv_spawnmap, Cmd_Argv(1)); } /* @@ -336,16 +294,12 @@ Restarts the current server for a dead player */ void Host_Restart_f (void) { - char mapname[MAX_QPATH]; - if (cls.demoplayback || !sv.active) return; if (cmd_source != src_command) return; - strcpy (mapname, sv.name); // must copy out, because it gets cleared - // in sv_spawnserver - SV_SpawnServer (mapname); + strcpy (sv_spawnmap, sv.name); } /* @@ -358,7 +312,7 @@ This is sent just before a server changes levels */ void Host_Reconnect_f (void) { -// SCR_BeginLoadingPlaque (); + SCR_BeginLoadingPlaque (); cls.signon = 0; // need new connection messages } @@ -371,14 +325,11 @@ User command to connect to server */ void Host_Connect_f (void) { - char name[MAX_QPATH]; - + char name[MAX_QPATH]; + cls.demonum = -1; // stop demo loop in case this fails if (cls.demoplayback) - { - CL_StopPlayback (); CL_Disconnect (); - } strcpy (name, Cmd_Argv(1)); CL_EstablishConnection (name); Host_Reconnect_f (); @@ -399,7 +350,7 @@ LOAD / SAVE GAME =============== Host_SavegameComment -Writes a SAVEGAME_COMMENT_LENGTH character comment describing the current +Writes a SAVEGAME_COMMENT_LENGTH character comment describing the current =============== */ void Host_SavegameComment (char *text) @@ -464,10 +415,10 @@ void Host_Savegame_f (void) Con_Printf ("Relative pathnames are not allowed.\n"); return; } - + for (i=0 ; iv.health <= 0) ) + if (svs.clients[i].active && (svs.clients[i].edict->v->health <= 0) ) { Con_Printf ("Can't savegame with a dead player\n"); return; @@ -476,7 +427,7 @@ void Host_Savegame_f (void) sprintf (name, "%s/%s", com_gamedir, Cmd_Argv(1)); COM_DefaultExtension (name, ".sav"); - + Con_Printf ("Saving game to %s...\n", name); f = Qopen (name, "w"); if (!f) @@ -484,7 +435,7 @@ void Host_Savegame_f (void) Con_Printf ("ERROR: couldn't open.\n"); return; } - + Qprintf (f, "%i\n", SAVEGAME_VERSION); Host_SavegameComment (comment); Qprintf (f, "%s\n", comment); @@ -516,6 +467,8 @@ void Host_Savegame_f (void) } +extern mempool_t *edictstring_mempool; + /* =============== Host_Loadgame_f @@ -523,18 +476,6 @@ Host_Loadgame_f */ void Host_Loadgame_f (void) { - char name[MAX_OSPATH]; - QFile *f; - char mapname[MAX_QPATH]; - float time, tfloat; - char buf[32768], *start; - char *str; - int i, r; - edict_t *ent; - int entnum; - int version; - float spawn_parms[NUM_SPAWN_PARMS]; - if (cmd_source != src_command) return; @@ -544,17 +485,28 @@ void Host_Loadgame_f (void) return; } - cls.demonum = -1; // stop demo loop in case this fails + sprintf (sv_loadgame, "%s/%s", com_gamedir, Cmd_Argv(1)); + COM_DefaultExtension (sv_loadgame, ".sav"); - sprintf (name, "%s/%s", com_gamedir, Cmd_Argv(1)); - COM_DefaultExtension (name, ".sav"); + Con_Printf ("Loading game from %s...\n", sv_loadgame); +} - // LordHavoc: made SCR_UpdateScreen use a great deal less stack space, no longer an issue - //// we can't call SCR_BeginLoadingPlaque, because too much stack space has - //// been used. The menu calls it before stuffing loadgame command -// SCR_BeginLoadingPlaque (); +void Host_PerformLoadGame(char *name) +{ + QFile *f; + char mapname[MAX_QPATH]; + float time, tfloat; + char buf[32768]; + const char *start; + char *str; + int i, r; + edict_t *ent; + int entnum; + int version; + float spawn_parms[NUM_SPAWN_PARMS]; + + cls.demonum = -1; // stop demo loop in case this fails - Con_Printf ("Loading game from %s...\n", name); f = Qopen (name, "rz"); if (!f) { @@ -570,8 +522,12 @@ void Host_Loadgame_f (void) Con_Printf ("Savegame is version %i, not %i\n", version, SAVEGAME_VERSION); return; } + + SCR_BeginLoadingPlaque (); + str = Qgetline (f); - for (i=0 ; iv, 0, progs->entityfields * 4); + memset (ent->v, 0, progs->entityfields * 4); ent->free = false; ED_ParseEdict (start, ent); - - // link it into the bsp tree + + // link it into the bsp tree if (!ent->free) SV_LinkEdict (ent, false); } entnum++; } - + sv.num_edicts = entnum; sv.time = time; Qclose (f); - for (i=0 ; ispawn_parms[i] = spawn_parms[i]; if (cls.state != ca_dedicated) @@ -676,17 +636,18 @@ Host_Name_f */ void Host_Name_f (void) { - char *newName; + char newName[64]; if (Cmd_Argc () == 1) { Con_Printf ("\"name\" is \"%s\"\n", cl_name.string); return; } + if (Cmd_Argc () == 2) - newName = Cmd_Argv(1); + strncpy(newName, Cmd_Argv(1), 15); else - newName = Cmd_Args(); + strncpy(newName, Cmd_Args(), 15); newName[15] = 0; if (cmd_source == src_command) @@ -703,31 +664,30 @@ void Host_Name_f (void) if (strcmp(host_client->name, newName) != 0) Con_Printf ("%s renamed to %s\n", host_client->name, newName); strcpy (host_client->name, newName); - host_client->edict->v.netname = host_client->name - pr_strings; - + host_client->edict->v->netname = PR_SetString(host_client->name); + // send notification to all clients - + MSG_WriteByte (&sv.reliable_datagram, svc_updatename); MSG_WriteByte (&sv.reliable_datagram, host_client - svs.clients); MSG_WriteString (&sv.reliable_datagram, host_client->name); } - + void Host_Version_f (void) { - Con_Printf ("Version %4.2f (build %i)\n", VERSION, buildnumber); - Con_Printf ("Exe: "__TIME__" "__DATE__"\n"); + Con_Printf ("Version: %s build %s\n", gamename, buildstring); } void Host_Say(qboolean teamonly) { client_t *client; client_t *save; - int j; - char *p; + int j; + const char *p1, *p2; // LordHavoc: 256 char say messages - unsigned char text[256]; - qboolean fromServer = false; + unsigned char text[256]; + qboolean fromServer = false; if (cmd_source == src_command) { @@ -746,34 +706,40 @@ void Host_Say(qboolean teamonly) if (Cmd_Argc () < 2) return; - save = host_client; - - p = Cmd_Args(); -// remove quotes if present - if (*p == '"') - { - p++; - p[strlen(p)-1] = 0; - } - // turn on color set 1 if (!fromServer) - sprintf (text, "%c%s: ", 1, save->name); + sprintf (text, "%c%s: ", 1, host_client->name); else sprintf (text, "%c<%s> ", 1, hostname.string); - j = sizeof(text) - 2 - strlen(text); // -2 for /n and null terminator - if (strlen(p) > j) - p[j] = 0; + save = host_client; - strcat (text, p); - strcat (text, "\n"); + p1 = Cmd_Args(); + p2 = p1 + strlen(p1); + // remove trailing newlines + while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r')) + p2--; + // remove quotes if present + if (*p1 == '"') + { + p1++; + if (p2[-1] == '"') + p2--; + else + Con_Printf("Host_Say: missing end quote\n"); + } + while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r')) + p2--; + for (j = strlen(text);j < (int)(sizeof(text) - 2) && p1 < p2;) + text[j++] = *p1++; + text[j++] = '\n'; + text[j++] = 0; for (j = 0, client = svs.clients; j < svs.maxclients; j++, client++) { if (!client || !client->active || !client->spawned) continue; - if (teamplay.value && teamonly && client->edict->v.team != save->edict->v.team) + if (teamplay.integer && teamonly && client->edict->v->team != save->edict->v->team) continue; host_client = client; SV_ClientPrintf("%s", text); @@ -800,38 +766,55 @@ void Host_Tell_f(void) { client_t *client; client_t *save; - int j; - char *p; - char text[1024]; // LordHavoc: FIXME: temporary buffer overflow fix (was 64) + int j; + const char *p1, *p2; + char text[1024]; // LordHavoc: FIXME: temporary buffer overflow fix (was 64) + qboolean fromServer = false; if (cmd_source == src_command) { - Cmd_ForwardToServer (); - return; + if (cls.state == ca_dedicated) + fromServer = true; + else + { + Cmd_ForwardToServer (); + return; + } } if (Cmd_Argc () < 3) return; - strcpy(text, host_client->name); - strcat(text, ": "); - - p = Cmd_Args(); - -// remove quotes if present - if (*p == '"') - { - p++; - p[strlen(p)-1] = 0; + if (!fromServer) + sprintf (text, "%s: ", host_client->name); + else + sprintf (text, "<%s> ", hostname.string); + + p1 = Cmd_Args(); + p2 = p1 + strlen(p1); + // remove the target name + while (p1 < p2 && *p1 != ' ') + p1++; + while (p1 < p2 && *p1 == ' ') + p1++; + // remove trailing newlines + while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r')) + p2--; + // remove quotes if present + if (*p1 == '"') + { + p1++; + if (p2[-1] == '"') + p2--; + else + Con_Printf("Host_Say: missing end quote\n"); } - -// check length & truncate if necessary - j = sizeof(text) - 2 - strlen(text); // -2 for /n and null terminator - if (strlen(p) > j) - p[j] = 0; - - strcat (text, p); - strcat (text, "\n"); + while (p2 > p1 && (p2[-1] == '\n' || p2[-1] == '\r')) + p2--; + for (j = strlen(text);j < (int)(sizeof(text) - 2) && p1 < p2;) + text[j++] = *p1++; + text[j++] = '\n'; + text[j++] = 0; save = host_client; for (j = 0, client = svs.clients; j < svs.maxclients; j++, client++) @@ -859,11 +842,11 @@ void Host_Color_f(void) int playercolor; dfunction_t *f; func_t SV_ChangeTeam; - + if (Cmd_Argc() == 1) { - Con_Printf ("\"color\" is \"%i %i\"\n", ((int)cl_color.value) >> 4, ((int)cl_color.value) & 0x0f); - Con_Printf ("color <0-13> [0-13]\n"); + Con_Printf ("\"color\" is \"%i %i\"\n", cl_color.integer >> 4, cl_color.integer & 15); + Con_Printf ("color <0-15> [0-15]\n"); return; } @@ -874,7 +857,7 @@ void Host_Color_f(void) top = atoi(Cmd_Argv(1)); bottom = atoi(Cmd_Argv(2)); } - + top &= 15; // LordHavoc: allow skin colormaps 14 and 15 (was 13) if (top > 15) @@ -883,7 +866,7 @@ void Host_Color_f(void) // LordHavoc: allow skin colormaps 14 and 15 (was 13) if (bottom > 15) bottom = 15; - + playercolor = top*16 + bottom; if (cmd_source == src_command) @@ -894,19 +877,18 @@ void Host_Color_f(void) return; } - // void(float color) SV_ChangeTeam; if ((f = ED_FindFunction ("SV_ChangeTeam")) && (SV_ChangeTeam = (func_t)(f - pr_functions))) { Con_DPrintf("Calling SV_ChangeTeam\n"); pr_global_struct->time = sv.time; - pr_globals[0] = playercolor; + pr_globals[OFS_PARM0] = playercolor; pr_global_struct->self = EDICT_TO_PROG(host_client->edict); PR_ExecuteProgram (SV_ChangeTeam, ""); } else { host_client->colors = playercolor; - host_client->edict->v.team = bottom + 1; + host_client->edict->v->team = bottom + 1; // send notification to all clients MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors); @@ -928,12 +910,12 @@ void Host_Kill_f (void) return; } - if (sv_player->v.health <= 0) + if (sv_player->v->health <= 0) { SV_ClientPrintf ("Can't suicide -- already dead!\n"); return; } - + pr_global_struct->time = sv.time; pr_global_struct->self = EDICT_TO_PROG(sv_player); PR_ExecuteProgram (pr_global_struct->ClientKill, "QC function ClientKill is missing"); @@ -947,13 +929,13 @@ Host_Pause_f */ void Host_Pause_f (void) { - + if (cmd_source == src_command) { Cmd_ForwardToServer (); return; } - if (!pausable.value) + if (!pausable.integer) SV_ClientPrintf ("Pause not allowed.\n"); else { @@ -961,11 +943,11 @@ void Host_Pause_f (void) if (sv.paused) { - SV_BroadcastPrintf ("%s paused the game\n", pr_strings + sv_player->v.netname); + SV_BroadcastPrintf ("%s paused the game\n", PR_GetString(sv_player->v->netname)); } else { - SV_BroadcastPrintf ("%s unpaused the game\n",pr_strings + sv_player->v.netname); + SV_BroadcastPrintf ("%s unpaused the game\n", PR_GetString(sv_player->v->netname)); } // send notification to all clients @@ -995,7 +977,7 @@ void Host_PreSpawn_f (void) Con_Printf ("prespawn not valid -- already spawned\n"); return; } - + SZ_Write (&host_client->message, sv.signon.data, sv.signon.cursize); MSG_WriteByte (&host_client->message, svc_signonnum); MSG_WriteByte (&host_client->message, 2); @@ -1033,7 +1015,8 @@ void Host_Spawn_f (void) // run the entrance script if (sv.loadgame) - { // loaded games are fully inited already + { + // loaded games are fully initialized already // if this is the last client to be connected, unpause sv.paused = false; @@ -1052,10 +1035,10 @@ void Host_Spawn_f (void) // set up the edict ent = host_client->edict; - memset (&ent->v, 0, progs->entityfields * 4); - ent->v.colormap = NUM_FOR_EDICT(ent); - ent->v.team = (host_client->colors & 15) + 1; - ent->v.netname = host_client->name - pr_strings; + memset (ent->v, 0, progs->entityfields * 4); + ent->v->colormap = NUM_FOR_EDICT(ent); + ent->v->team = (host_client->colors & 15) + 1; + ent->v->netname = PR_SetString(host_client->name); if ((val = GETEDICTFIELDVALUE(host_client->edict, eval_pmodel))) val->_float = host_client->pmodel; @@ -1093,7 +1076,7 @@ void Host_Spawn_f (void) MSG_WriteByte (&host_client->message, i); MSG_WriteByte (&host_client->message, client->colors); } - + // send all current light styles for (i=0 ; imessage, STAT_MONSTERS); MSG_WriteLong (&host_client->message, pr_global_struct->killed_monsters); -// // send a fixangle // Never send a roll angle, because savegames can catch the server // in a state where it is expecting the client to correct the angle @@ -1130,7 +1112,7 @@ void Host_Spawn_f (void) ent = EDICT_NUM( 1 + (host_client - svs.clients) ); MSG_WriteByte (&host_client->message, svc_setangle); for (i=0 ; i < 2 ; i++) - MSG_WriteAngle (&host_client->message, ent->v.angles[i] ); + MSG_WriteAngle (&host_client->message, ent->v->angles[i] ); MSG_WriteAngle (&host_client->message, 0 ); SV_WriteClientdataToMessage (sv_player, &host_client->message); @@ -1168,11 +1150,11 @@ Kicks a user off of the server */ void Host_Kick_f (void) { - char *who; - char *message = NULL; - client_t *save; - int i; - qboolean byNumber = false; + char *who; + const char *message = NULL; + client_t *save; + int i; + qboolean byNumber = false; if (cmd_source == src_command) { @@ -1211,10 +1193,12 @@ void Host_Kick_f (void) if (i < svs.maxclients) { if (cmd_source == src_command) + { if (cls.state == ca_dedicated) who = "Console"; else who = cl_name.string; + } else who = save->name; @@ -1224,7 +1208,8 @@ void Host_Kick_f (void) if (Cmd_Argc() > 2) { - message = COM_Parse(Cmd_Args()); + message = Cmd_Args(); + COM_ParseToken(&message); if (byNumber) { message++; // skip the # @@ -1260,9 +1245,9 @@ Host_Give_f */ void Host_Give_f (void) { - char *t; - int v; - eval_t *val; + const char *t; + int v; + eval_t *val; if (cmd_source == src_command) { @@ -1275,150 +1260,150 @@ void Host_Give_f (void) t = Cmd_Argv(1); v = atoi (Cmd_Argv(2)); - + switch (t[0]) { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - // MED 01/04/97 added hipnotic give stuff - if (hipnotic) - { - if (t[0] == '6') - { - if (t[1] == 'a') - sv_player->v.items = (int)sv_player->v.items | HIT_PROXIMITY_GUN; - else - sv_player->v.items = (int)sv_player->v.items | IT_GRENADE_LAUNCHER; - } - else if (t[0] == '9') - sv_player->v.items = (int)sv_player->v.items | HIT_LASER_CANNON; - else if (t[0] == '0') - sv_player->v.items = (int)sv_player->v.items | HIT_MJOLNIR; - else if (t[0] >= '2') - sv_player->v.items = (int)sv_player->v.items | (IT_SHOTGUN << (t[0] - '2')); - } - else - { - if (t[0] >= '2') - sv_player->v.items = (int)sv_player->v.items | (IT_SHOTGUN << (t[0] - '2')); - } + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + // MED 01/04/97 added hipnotic give stuff + if (gamemode == GAME_HIPNOTIC) + { + if (t[0] == '6') + { + if (t[1] == 'a') + sv_player->v->items = (int)sv_player->v->items | HIT_PROXIMITY_GUN; + else + sv_player->v->items = (int)sv_player->v->items | IT_GRENADE_LAUNCHER; + } + else if (t[0] == '9') + sv_player->v->items = (int)sv_player->v->items | HIT_LASER_CANNON; + else if (t[0] == '0') + sv_player->v->items = (int)sv_player->v->items | HIT_MJOLNIR; + else if (t[0] >= '2') + sv_player->v->items = (int)sv_player->v->items | (IT_SHOTGUN << (t[0] - '2')); + } + else + { + if (t[0] >= '2') + sv_player->v->items = (int)sv_player->v->items | (IT_SHOTGUN << (t[0] - '2')); + } break; - - case 's': - if (rogue) + + case 's': + if (gamemode == GAME_ROGUE) { - if ((val = GETEDICTFIELDVALUE(sv_player, eval_ammo_shells1))) - val->_float = v; + if ((val = GETEDICTFIELDVALUE(sv_player, eval_ammo_shells1))) + val->_float = v; } - sv_player->v.ammo_shells = v; - break; - case 'n': - if (rogue) + sv_player->v->ammo_shells = v; + break; + case 'n': + if (gamemode == GAME_ROGUE) { - if ((val = GETEDICTFIELDVALUE(sv_player, eval_ammo_nails1))) + if ((val = GETEDICTFIELDVALUE(sv_player, eval_ammo_nails1))) { - val->_float = v; - if (sv_player->v.weapon <= IT_LIGHTNING) - sv_player->v.ammo_nails = v; + val->_float = v; + if (sv_player->v->weapon <= IT_LIGHTNING) + sv_player->v->ammo_nails = v; } } else { - sv_player->v.ammo_nails = v; + sv_player->v->ammo_nails = v; } - break; - case 'l': - if (rogue) + break; + case 'l': + if (gamemode == GAME_ROGUE) { val = GETEDICTFIELDVALUE(sv_player, eval_ammo_lava_nails); if (val) { val->_float = v; - if (sv_player->v.weapon > IT_LIGHTNING) - sv_player->v.ammo_nails = v; + if (sv_player->v->weapon > IT_LIGHTNING) + sv_player->v->ammo_nails = v; } } - break; - case 'r': - if (rogue) + break; + case 'r': + if (gamemode == GAME_ROGUE) { val = GETEDICTFIELDVALUE(sv_player, eval_ammo_rockets1); if (val) { val->_float = v; - if (sv_player->v.weapon <= IT_LIGHTNING) - sv_player->v.ammo_rockets = v; + if (sv_player->v->weapon <= IT_LIGHTNING) + sv_player->v->ammo_rockets = v; } } else { - sv_player->v.ammo_rockets = v; + sv_player->v->ammo_rockets = v; } - break; - case 'm': - if (rogue) + break; + case 'm': + if (gamemode == GAME_ROGUE) { val = GETEDICTFIELDVALUE(sv_player, eval_ammo_multi_rockets); if (val) { val->_float = v; - if (sv_player->v.weapon > IT_LIGHTNING) - sv_player->v.ammo_rockets = v; + if (sv_player->v->weapon > IT_LIGHTNING) + sv_player->v->ammo_rockets = v; } } - break; - case 'h': - sv_player->v.health = v; - break; - case 'c': - if (rogue) + break; + case 'h': + sv_player->v->health = v; + break; + case 'c': + if (gamemode == GAME_ROGUE) { val = GETEDICTFIELDVALUE(sv_player, eval_ammo_cells1); if (val) { val->_float = v; - if (sv_player->v.weapon <= IT_LIGHTNING) - sv_player->v.ammo_cells = v; + if (sv_player->v->weapon <= IT_LIGHTNING) + sv_player->v->ammo_cells = v; } } else { - sv_player->v.ammo_cells = v; + sv_player->v->ammo_cells = v; } - break; - case 'p': - if (rogue) + break; + case 'p': + if (gamemode == GAME_ROGUE) { val = GETEDICTFIELDVALUE(sv_player, eval_ammo_plasma); if (val) { val->_float = v; - if (sv_player->v.weapon > IT_LIGHTNING) - sv_player->v.ammo_cells = v; + if (sv_player->v->weapon > IT_LIGHTNING) + sv_player->v->ammo_cells = v; } } - break; - } + break; + } } edict_t *FindViewthing (void) { int i; edict_t *e; - + for (i=0 ; iv.classname, "viewthing") ) + if (!strcmp (PR_GetString(e->v->classname), "viewthing")) return e; } Con_Printf ("No viewthing on map\n"); @@ -1439,15 +1424,15 @@ void Host_Viewmodel_f (void) if (!e) return; - m = Mod_ForName (Cmd_Argv(1), false); + m = Mod_ForName (Cmd_Argv(1), false, true, false); if (!m) { Con_Printf ("Can't load %s\n", Cmd_Argv(1)); return; } - - e->v.frame = 0; - cl.model_precache[(int)e->v.modelindex] = m; + + e->v->frame = 0; + cl.model_precache[(int)e->v->modelindex] = m; } /* @@ -1464,22 +1449,20 @@ void Host_Viewframe_f (void) e = FindViewthing (); if (!e) return; - m = cl.model_precache[(int)e->v.modelindex]; + m = cl.model_precache[(int)e->v->modelindex]; f = atoi(Cmd_Argv(1)); if (f >= m->numframes) f = m->numframes-1; - e->v.frame = f; + e->v->frame = f; } void PrintFrameName (model_t *m, int frame) { - int data; - data = (int) Mod_Extradata(m); - if (m->ofs_scenes && data) - Con_Printf("frame %i: %s\n", frame, ((animscene_t *) (m->ofs_scenes + data))[frame].name); + if (m->animscenes) + Con_Printf("frame %i: %s\n", frame, m->animscenes[frame].name); else Con_Printf("frame %i\n", frame); } @@ -1493,17 +1476,17 @@ void Host_Viewnext_f (void) { edict_t *e; model_t *m; - + e = FindViewthing (); if (!e) return; - m = cl.model_precache[(int)e->v.modelindex]; + m = cl.model_precache[(int)e->v->modelindex]; - e->v.frame = e->v.frame + 1; - if (e->v.frame >= m->numframes) - e->v.frame = m->numframes - 1; + e->v->frame = e->v->frame + 1; + if (e->v->frame >= m->numframes) + e->v->frame = m->numframes - 1; - PrintFrameName (m, e->v.frame); + PrintFrameName (m, e->v->frame); } /* @@ -1520,13 +1503,13 @@ void Host_Viewprev_f (void) if (!e) return; - m = cl.model_precache[(int)e->v.modelindex]; + m = cl.model_precache[(int)e->v->modelindex]; - e->v.frame = e->v.frame - 1; - if (e->v.frame < 0) - e->v.frame = 0; + e->v->frame = e->v->frame - 1; + if (e->v->frame < 0) + e->v->frame = 0; - PrintFrameName (m, e->v.frame); + PrintFrameName (m, e->v->frame); } /* @@ -1549,8 +1532,13 @@ void Host_Startdemos_f (void) if (cls.state == ca_dedicated) { - if (!sv.active) - Cbuf_AddText ("map start\n"); + if (!sv.active && !sv_spawnmap[0]) + { + if (gamemode == GAME_TRANSFUSION) + Cbuf_AddText ("map bb1\n"); + else + Cbuf_AddText ("map start\n"); + } return; } @@ -1601,14 +1589,27 @@ Return to looping demos */ void Host_Stopdemo_f (void) { - if (cls.state == ca_dedicated) - return; if (!cls.demoplayback) return; - CL_StopPlayback (); CL_Disconnect (); } +// LordHavoc: because we don't want to load things before the video starts, +// we have to delay map and game loads until AFTER video is initialized +void Host_PerformSpawnServerAndLoadGame(void) +{ + if (vid_hidden && cls.state != ca_dedicated) + return; + if (sv_loadgame[0]) + Host_PerformLoadGame(sv_loadgame); + else if (sv_spawnmap[0]) + SV_SpawnServer(sv_spawnmap); + if (sv.active && cls.state == ca_disconnected) + Cmd_ExecuteString ("connect local", src_command); + sv_loadgame[0] = 0; + sv_spawnmap[0] = 0; +} + //============================================================================= /* @@ -1620,7 +1621,7 @@ void Host_InitCommands (void) { Cmd_AddCommand ("status", Host_Status_f); Cmd_AddCommand ("quit", Host_Quit_f); - if (nehahra) + if (gamemode == GAME_NEHAHRA) { Cmd_AddCommand ("max", Host_God_f); Cmd_AddCommand ("monster", Host_Notarget_f); @@ -1665,6 +1666,5 @@ void Host_InitCommands (void) Cmd_AddCommand ("viewframe", Host_Viewframe_f); Cmd_AddCommand ("viewnext", Host_Viewnext_f); Cmd_AddCommand ("viewprev", Host_Viewprev_f); - - Cmd_AddCommand ("mcache", Mod_Print); } +