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

move the VID_SetCaption call into CL_SetState where it belongs and fix

Browse source 
CL_SetState for when connecting to the server (dunno how I mangled that one)
This commit is contained in:
Bill Currie 2002-07-26 20:50:53 +00:00
parent 587ac5670b
commit 81af9b14e9
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
qw/source/cl_main.c
View file

@ -1133,6 +1133,17 @@ CL_SetState (cactive_t state)
key_dest = key_console; key_dest = key_console;
if (con_module) if (con_module)
con_module->data->console->force_commandline = 1; con_module->data->console->force_commandline = 1;
// Auto demo recorder stops here
if(cl_autorecord->int_val && cls.demorecording)
CL_Stop_f ();
} else if (state == ca_active) {
// entering active state
VID_SetCaption (cls.servername);
IN_ClearStates ();
r_active = true;
game_target = IMT_0;
key_dest = key_game;
if (con_module) if (con_module)
con_module->data->console->force_commandline = 0; con_module->data->console->force_commandline = 0;
@ -1140,16 +1151,6 @@ CL_SetState (cactive_t state)
if(cl_autorecord->int_val && !cls.demoplayback if(cl_autorecord->int_val && !cls.demoplayback
&& !cls.demorecording) && !cls.demorecording)
CL_Record (0); CL_Record (0);
} else if (state == ca_active) {
// entering active state
IN_ClearStates ();
r_active = true;
game_target = IMT_0;
key_dest = key_game;
// Auto demo recorder stops here
if(cl_autorecord->int_val && cls.demorecording)
CL_Stop_f ();
} }
} }
} }

1
qw/source/cl_pred.c
View file

@ -105,7 +105,6 @@ check_onserver (void)
// we can now render a frame // we can now render a frame
if (cls.state == ca_onserver) { if (cls.state == ca_onserver) {
// first update is the final signon stage // first update is the final signon stage
VID_SetCaption (cls.servername);
CL_SetState (ca_active); CL_SetState (ca_active);
} }
} }