qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-05-30 16:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

cl_ents.c: Killed an unused variable which gcc did not catch.

Browse source 
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:
Zephaniah E. Hull 2001-01-15 18:14:36 +00:00
parent bbac14a7d5
commit 2569e34ea9
4 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
source/cl_ents.c
View file

@ -752,7 +752,6 @@ CL_ParsePlayerinfo (void)
{
int msec;
int flags;
player_info_t *info;
player_state_t *state;
int num;
int i;
@ -762,8 +761,6 @@ CL_ParsePlayerinfo (void)
// Sys_Error ("CL_ParsePlayerinfo: bad num");
Host_EndGame ("CL_ParsePlayerinfo: bad num");
info = &cl.players[num];
state = &cl.frames[parsecountmod].playerstate[num];
state->number = num;

1
source/cl_parse.c
View file

@ -1009,6 +1009,7 @@ CL_ProcessUserInfo (int slot, player_info_t *player)
{
strncpy (player->name, Info_ValueForKey (player->userinfo, "name"),
sizeof (player->name) - 1);
player->_topcolor = player->_bottomcolor = -1;
player->topcolor = atoi (Info_ValueForKey (player->userinfo, "topcolor"));
player->bottomcolor =
atoi (Info_ValueForKey (player->userinfo, "bottomcolor"));

12
source/pr_edict.c
View file

@ -48,8 +48,9 @@
#include "server.h"
#include "world.h"
cvar_t *r_skyname;
cvar_t *pr_boundscheck;
cvar_t *r_skyname;
cvar_t *pr_boundscheck;
cvar_t *qwprog;
void SV_Error (char *error, ...);
void FindEdictFieldOffsets (progs_t *pr);
@ -925,8 +926,10 @@ PR_LoadProgs (progs_t *pr)
for (i = 0; i < GEFV_CACHESIZE; i++)
gefvCache[i].field[0] = 0;
pr->progs = (dprograms_t *) COM_LoadHunkFile ("qwprogs.dat");
if (!pr->progs)
pr->progs = (dprograms_t *) COM_LoadHunkFile (qwprog->string);
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");
if (!pr->progs)
SV_Error ("PR_LoadProgs: couldn't load progs.dat");
@ -1126,6 +1129,7 @@ PR_Init_Cvars (void)
pr_boundscheck =
Cvar_Get ("pr_boundscheck", "1", CVAR_NONE,
"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

8
source/sv_user.c
View file

@ -158,14 +158,6 @@ SV_New_f (void)
MSG_WriteByte (&host_client->netchan.message, svc_stufftext);
MSG_WriteString (&host_client->netchan.message,
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));
}
}
/*