mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-01-31 05:00:35 +00:00
do key_dest right
This commit is contained in:
parent
7b4e395dcb
commit
ba0d0c755c
7 changed files with 13 additions and 2 deletions
|
@ -46,6 +46,7 @@
|
||||||
#include "QF/sys.h"
|
#include "QF/sys.h"
|
||||||
#include "QF/console.h"
|
#include "QF/console.h"
|
||||||
#include "QF/cmd.h"
|
#include "QF/cmd.h"
|
||||||
|
#include "QF/keys.h"
|
||||||
|
|
||||||
void CL_FinishTimeDemo (void);
|
void CL_FinishTimeDemo (void);
|
||||||
|
|
||||||
|
@ -307,6 +308,7 @@ CL_PlayDemo_f (void)
|
||||||
cls.demoplayback = true;
|
cls.demoplayback = true;
|
||||||
cls.state = ca_connected;
|
cls.state = ca_connected;
|
||||||
cls.forcetrack = 0;
|
cls.forcetrack = 0;
|
||||||
|
key_dest = key_game;
|
||||||
|
|
||||||
while ((c = Qgetc (cls.demofile)) != '\n')
|
while ((c = Qgetc (cls.demofile)) != '\n')
|
||||||
if (c == '-')
|
if (c == '-')
|
||||||
|
|
|
@ -36,6 +36,7 @@
|
||||||
#include "QF/console.h"
|
#include "QF/console.h"
|
||||||
#include "QF/cvar.h"
|
#include "QF/cvar.h"
|
||||||
#include "QF/input.h"
|
#include "QF/input.h"
|
||||||
|
#include "QF/keys.h"
|
||||||
#include "QF/msg.h"
|
#include "QF/msg.h"
|
||||||
#include "QF/screen.h"
|
#include "QF/screen.h"
|
||||||
#include "QF/va.h"
|
#include "QF/va.h"
|
||||||
|
@ -278,6 +279,7 @@ CL_EstablishConnection (char *host)
|
||||||
cls.state = ca_connected;
|
cls.state = ca_connected;
|
||||||
cls.signon = 0; // need all the signon messages
|
cls.signon = 0; // need all the signon messages
|
||||||
// before playing
|
// before playing
|
||||||
|
key_dest = key_game;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -537,6 +537,7 @@ SCR_SetUpToDrawConsole (void)
|
||||||
if (cls.state != ca_active) {
|
if (cls.state != ca_active) {
|
||||||
scr_conlines = vid.height; // full screen
|
scr_conlines = vid.height; // full screen
|
||||||
scr_con_current = scr_conlines;
|
scr_con_current = scr_conlines;
|
||||||
|
key_dest = key_console;
|
||||||
} else if (key_dest == key_console)
|
} else if (key_dest == key_console)
|
||||||
scr_conlines = vid.height * bound (0.2, scr_consize->value, 1);
|
scr_conlines = vid.height * bound (0.2, scr_consize->value, 1);
|
||||||
else
|
else
|
||||||
|
|
|
@ -563,6 +563,7 @@ SCR_SetUpToDrawConsole (void)
|
||||||
if (cls.state != ca_active) {
|
if (cls.state != ca_active) {
|
||||||
scr_conlines = vid.height; // full screen
|
scr_conlines = vid.height; // full screen
|
||||||
scr_con_current = scr_conlines;
|
scr_con_current = scr_conlines;
|
||||||
|
key_dest = key_console;
|
||||||
} else if (key_dest == key_console)
|
} else if (key_dest == key_console)
|
||||||
scr_conlines = vid.height * bound (0.2, scr_consize->value, 1);
|
scr_conlines = vid.height * bound (0.2, scr_consize->value, 1);
|
||||||
else
|
else
|
||||||
|
|
|
@ -32,11 +32,13 @@
|
||||||
|
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
|
#include "QF/console.h"
|
||||||
|
#include "QF/cvar.h"
|
||||||
|
#include "QF/keys.h"
|
||||||
|
|
||||||
#include "bothdefs.h"
|
#include "bothdefs.h"
|
||||||
#include "cl_ents.h"
|
#include "cl_ents.h"
|
||||||
#include "client.h"
|
#include "client.h"
|
||||||
#include "QF/console.h"
|
|
||||||
#include "QF/cvar.h"
|
|
||||||
#include "pmove.h"
|
#include "pmove.h"
|
||||||
|
|
||||||
cvar_t *cl_nopred;
|
cvar_t *cl_nopred;
|
||||||
|
@ -140,6 +142,7 @@ CL_PredictMove (void)
|
||||||
// stage
|
// stage
|
||||||
VID_SetCaption (cls.servername);
|
VID_SetCaption (cls.servername);
|
||||||
cls.state = ca_active;
|
cls.state = ca_active;
|
||||||
|
key_dest = key_game;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cl_nopred->int_val) {
|
if (cl_nopred->int_val) {
|
||||||
|
|
|
@ -537,6 +537,7 @@ SCR_SetUpToDrawConsole (void)
|
||||||
if (cls.state != ca_active) {
|
if (cls.state != ca_active) {
|
||||||
scr_conlines = vid.height; // full screen
|
scr_conlines = vid.height; // full screen
|
||||||
scr_con_current = scr_conlines;
|
scr_con_current = scr_conlines;
|
||||||
|
key_dest = key_console;
|
||||||
} else if (key_dest == key_console)
|
} else if (key_dest == key_console)
|
||||||
scr_conlines = vid.height * bound (0.2, scr_consize->value, 1);
|
scr_conlines = vid.height * bound (0.2, scr_consize->value, 1);
|
||||||
else
|
else
|
||||||
|
|
|
@ -562,6 +562,7 @@ SCR_SetUpToDrawConsole (void)
|
||||||
if (cls.state != ca_active) {
|
if (cls.state != ca_active) {
|
||||||
scr_conlines = vid.height; // full screen
|
scr_conlines = vid.height; // full screen
|
||||||
scr_con_current = scr_conlines;
|
scr_con_current = scr_conlines;
|
||||||
|
key_dest = key_console;
|
||||||
} else if (key_dest == key_console)
|
} else if (key_dest == key_console)
|
||||||
scr_conlines = vid.height * bound (0.2, scr_consize->value, 1);
|
scr_conlines = vid.height * bound (0.2, scr_consize->value, 1);
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue