qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-31 13:10:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

hopefully fix both the "get stuck waiting for 3d" bug and the null worldmodel bug.

Browse source
This commit is contained in:
Bill Currie 2007-03-18 03:37:37 +00:00 committed by Jeff Teunissen
parent e74a8a7c62
commit 659d95221e
2 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
qw/source/cl_parse.c
View file

@ -353,6 +353,7 @@ Model_NextDownload (void)
va (prespawn_name, cl.servercount, va (prespawn_name, cl.servercount,
cl.worldmodel->checksum2)); cl.worldmodel->checksum2));
} }
CL_SetState (ca_active);
} }
static void static void

13
qw/source/cl_pred.c
View file

@ -101,16 +101,6 @@ CL_PredictUsercmd (player_state_t * from, player_state_t * to, usercmd_t *u,
to->pls.weaponframe = from->pls.weaponframe; to->pls.weaponframe = from->pls.weaponframe;
} }
static inline void
check_onserver (void)
{
// we can now render a frame
if (cls.state == ca_onserver) {
// first update is the final signon stage
CL_SetState (ca_active);
}
}
void void
CL_PredictMove (void) CL_PredictMove (void)
{ {
@ -132,7 +122,6 @@ CL_PredictMove (void)
cl.time = realtime; cl.time = realtime;
if (cl.intermission) { if (cl.intermission) {
check_onserver ();
return; return;
} }
@ -148,8 +137,6 @@ CL_PredictMove (void)
// this is the last frame received from the server // this is the last frame received from the server
from = &cl.frames[cls.netchan.incoming_sequence & UPDATE_MASK]; from = &cl.frames[cls.netchan.incoming_sequence & UPDATE_MASK];
check_onserver ();
if (!cl_predict->int_val) { if (!cl_predict->int_val) {
VectorCopy (from->playerstate[cl.playernum].pls.velocity, cl.simvel); VectorCopy (from->playerstate[cl.playernum].pls.velocity, cl.simvel);
VectorCopy (from->playerstate[cl.playernum].pls.origin, cl.simorg); VectorCopy (from->playerstate[cl.playernum].pls.origin, cl.simorg);