From 659d95221ee48c4d51b19c4d8244aa772854b7ea Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sun, 18 Mar 2007 03:37:37 +0000 Subject: [PATCH] hopefully fix both the "get stuck waiting for 3d" bug and the null worldmodel bug. --- qw/source/cl_parse.c | 1 + qw/source/cl_pred.c | 13 ------------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/qw/source/cl_parse.c b/qw/source/cl_parse.c index dc9786205..a1209a8c7 100644 --- a/qw/source/cl_parse.c +++ b/qw/source/cl_parse.c @@ -353,6 +353,7 @@ Model_NextDownload (void) va (prespawn_name, cl.servercount, cl.worldmodel->checksum2)); } + CL_SetState (ca_active); } static void diff --git a/qw/source/cl_pred.c b/qw/source/cl_pred.c index 5fdd21754..b06fefef4 100644 --- a/qw/source/cl_pred.c +++ b/qw/source/cl_pred.c @@ -101,16 +101,6 @@ CL_PredictUsercmd (player_state_t * from, player_state_t * to, usercmd_t *u, 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 CL_PredictMove (void) { @@ -132,7 +122,6 @@ CL_PredictMove (void) cl.time = realtime; if (cl.intermission) { - check_onserver (); return; } @@ -148,8 +137,6 @@ CL_PredictMove (void) // this is the last frame received from the server from = &cl.frames[cls.netchan.incoming_sequence & UPDATE_MASK]; - check_onserver (); - if (!cl_predict->int_val) { VectorCopy (from->playerstate[cl.playernum].pls.velocity, cl.simvel); VectorCopy (from->playerstate[cl.playernum].pls.origin, cl.simorg);