From 81af9b14e99f2832960b036f01d60763cf4ea202 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Fri, 26 Jul 2002 20:50:53 +0000 Subject: [PATCH] move the VID_SetCaption call into CL_SetState where it belongs and fix CL_SetState for when connecting to the server (dunno how I mangled that one) --- qw/source/cl_main.c | 21 +++++++++++---------- qw/source/cl_pred.c | 1 - 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c index a8c148c1e..d803c07ee 100644 --- a/qw/source/cl_main.c +++ b/qw/source/cl_main.c @@ -1133,6 +1133,17 @@ CL_SetState (cactive_t state) key_dest = key_console; if (con_module) 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) con_module->data->console->force_commandline = 0; @@ -1140,16 +1151,6 @@ CL_SetState (cactive_t state) if(cl_autorecord->int_val && !cls.demoplayback && !cls.demorecording) 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 (); } } } diff --git a/qw/source/cl_pred.c b/qw/source/cl_pred.c index e02e30d2a..bf6522574 100644 --- a/qw/source/cl_pred.c +++ b/qw/source/cl_pred.c @@ -105,7 +105,6 @@ check_onserver (void) // we can now render a frame if (cls.state == ca_onserver) { // first update is the final signon stage - VID_SetCaption (cls.servername); CL_SetState (ca_active); } }