First stab at keydest sanitization

This commit is contained in:
Bill Currie 2013-01-19 22:33:34 +09:00
parent 72280186bf
commit 5d703c1f3e
3 changed files with 6 additions and 3 deletions

View file

@ -91,6 +91,7 @@ typedef struct {
// connection information
cactive_t state;
signon_t signon;
keydest_t key_dest;
// network stuff
struct qsocket_s *netcon;

View file

@ -478,6 +478,7 @@ CL_StartDemo (void)
cls.demoplayback = true;
CL_SetState (ca_connected);
cls.forcetrack = 0;
cls.key_dest = key_demo;
Key_SetKeyDest (key_demo);
while ((c = Qgetc (cls.demofile)) != '\n')

View file

@ -323,7 +323,7 @@ CL_EstablishConnection (const char *host)
cls.demonum = -1; // not in the demo loop now
CL_SetState (ca_connected);
Key_SetKeyDest (key_game);
Key_SetKeyDest (cls.key_dest);
}
/*
@ -514,14 +514,14 @@ CL_SetState (cactive_t state)
cls.signon = so_none; // need all the signon messages
// before playing
cl.loading = true;
Key_SetKeyDest (key_game);
Key_SetKeyDest (cls.key_dest);
IN_ClearStates ();
VID_SetCaption ("Connected");
break;
case ca_active:
// entering active state
cl.loading = false;
Key_SetKeyDest (key_game);
Key_SetKeyDest (cls.key_dest);
IN_ClearStates ();
VID_SetCaption ("");
S_AmbientOn ();
@ -583,5 +583,6 @@ CL_Init (cbuf_t *cbuf)
"to be level");
SZ_Alloc (&cls.message, 1024);
cls.key_dest = key_game;
CL_SetState (ca_disconnected);
}