mirror of
https://git.code.sf.net/p/quake/newtree
synced 2025-05-10 14:20:38 +00:00
cl_ents.c: Killed an unused variable which gcc did not catch.
cl_parse.c: Fixed the white body issue taniwha found, finally! pr_edict.c: From misty, server cvar qwprogs, use it to set the qwprogs.dat to something else. sv_user.c: Don't send the r_skyname command, the clients pickup the info line.
This commit is contained in:
parent
bbac14a7d5
commit
2569e34ea9
4 changed files with 9 additions and 15 deletions
|
@ -752,7 +752,6 @@ CL_ParsePlayerinfo (void)
|
||||||
{
|
{
|
||||||
int msec;
|
int msec;
|
||||||
int flags;
|
int flags;
|
||||||
player_info_t *info;
|
|
||||||
player_state_t *state;
|
player_state_t *state;
|
||||||
int num;
|
int num;
|
||||||
int i;
|
int i;
|
||||||
|
@ -762,8 +761,6 @@ CL_ParsePlayerinfo (void)
|
||||||
// Sys_Error ("CL_ParsePlayerinfo: bad num");
|
// Sys_Error ("CL_ParsePlayerinfo: bad num");
|
||||||
Host_EndGame ("CL_ParsePlayerinfo: bad num");
|
Host_EndGame ("CL_ParsePlayerinfo: bad num");
|
||||||
|
|
||||||
info = &cl.players[num];
|
|
||||||
|
|
||||||
state = &cl.frames[parsecountmod].playerstate[num];
|
state = &cl.frames[parsecountmod].playerstate[num];
|
||||||
|
|
||||||
state->number = num;
|
state->number = num;
|
||||||
|
|
|
@ -1009,6 +1009,7 @@ CL_ProcessUserInfo (int slot, player_info_t *player)
|
||||||
{
|
{
|
||||||
strncpy (player->name, Info_ValueForKey (player->userinfo, "name"),
|
strncpy (player->name, Info_ValueForKey (player->userinfo, "name"),
|
||||||
sizeof (player->name) - 1);
|
sizeof (player->name) - 1);
|
||||||
|
player->_topcolor = player->_bottomcolor = -1;
|
||||||
player->topcolor = atoi (Info_ValueForKey (player->userinfo, "topcolor"));
|
player->topcolor = atoi (Info_ValueForKey (player->userinfo, "topcolor"));
|
||||||
player->bottomcolor =
|
player->bottomcolor =
|
||||||
atoi (Info_ValueForKey (player->userinfo, "bottomcolor"));
|
atoi (Info_ValueForKey (player->userinfo, "bottomcolor"));
|
||||||
|
|
|
@ -48,8 +48,9 @@
|
||||||
#include "server.h"
|
#include "server.h"
|
||||||
#include "world.h"
|
#include "world.h"
|
||||||
|
|
||||||
cvar_t *r_skyname;
|
cvar_t *r_skyname;
|
||||||
cvar_t *pr_boundscheck;
|
cvar_t *pr_boundscheck;
|
||||||
|
cvar_t *qwprog;
|
||||||
|
|
||||||
void SV_Error (char *error, ...);
|
void SV_Error (char *error, ...);
|
||||||
void FindEdictFieldOffsets (progs_t *pr);
|
void FindEdictFieldOffsets (progs_t *pr);
|
||||||
|
@ -925,8 +926,10 @@ PR_LoadProgs (progs_t *pr)
|
||||||
for (i = 0; i < GEFV_CACHESIZE; i++)
|
for (i = 0; i < GEFV_CACHESIZE; i++)
|
||||||
gefvCache[i].field[0] = 0;
|
gefvCache[i].field[0] = 0;
|
||||||
|
|
||||||
pr->progs = (dprograms_t *) COM_LoadHunkFile ("qwprogs.dat");
|
pr->progs = (dprograms_t *) COM_LoadHunkFile (qwprog->string);
|
||||||
if (!pr->progs)
|
if ((!pr->progs) && (!strcmp(qwprog->string,"qwprogs.dat")))
|
||||||
|
pr->progs = (dprograms_t *) COM_LoadHunkFile ("qwprogs.dat");
|
||||||
|
if ((!pr->progs) && (!strcmp(qwprog->string,"progs.dat")))
|
||||||
pr->progs = (dprograms_t *) COM_LoadHunkFile ("progs.dat");
|
pr->progs = (dprograms_t *) COM_LoadHunkFile ("progs.dat");
|
||||||
if (!pr->progs)
|
if (!pr->progs)
|
||||||
SV_Error ("PR_LoadProgs: couldn't load progs.dat");
|
SV_Error ("PR_LoadProgs: couldn't load progs.dat");
|
||||||
|
@ -1126,6 +1129,7 @@ PR_Init_Cvars (void)
|
||||||
pr_boundscheck =
|
pr_boundscheck =
|
||||||
Cvar_Get ("pr_boundscheck", "1", CVAR_NONE,
|
Cvar_Get ("pr_boundscheck", "1", CVAR_NONE,
|
||||||
"Server progs bounds checking");
|
"Server progs bounds checking");
|
||||||
|
qwprog = Cvar_Get ("qwprog", "qwprogs.dat", CVAR_ROM, "Allows selectable qwprogs.dat if you have several of them in the gamedir");
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -158,14 +158,6 @@ SV_New_f (void)
|
||||||
MSG_WriteByte (&host_client->netchan.message, svc_stufftext);
|
MSG_WriteByte (&host_client->netchan.message, svc_stufftext);
|
||||||
MSG_WriteString (&host_client->netchan.message,
|
MSG_WriteString (&host_client->netchan.message,
|
||||||
va ("fullserverinfo \"%s\"\n", svs.info));
|
va ("fullserverinfo \"%s\"\n", svs.info));
|
||||||
|
|
||||||
// Send our current skybox
|
|
||||||
r_skyname = Cvar_FindVar ("r_skyname");
|
|
||||||
if (r_skyname != NULL) {
|
|
||||||
MSG_WriteByte (&host_client->netchan.message, svc_stufftext);
|
|
||||||
MSG_WriteString (&host_client->netchan.message, va ("r_skyname %s\n",
|
|
||||||
r_skyname->string));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue