IOQ3 commit 1942

This commit is contained in:
Richard Allen 2011-05-18 02:24:02 +00:00
parent 36b14c674b
commit 0492f22ca6
2 changed files with 22 additions and 1 deletions

View file

@ -1175,7 +1175,7 @@ void CL_KeyDownEvent( int key, unsigned time )
{
keys[key].down = qtrue;
keys[key].repeats++;
if( keys[key].repeats == 1 )
if( keys[key].repeats == 1 && key != K_SCROLLOCK && key != K_KP_NUMLOCK && key != K_CAPSLOCK )
anykeydown++;
if( keys[K_ALT].down && key == K_ENTER )
@ -1268,7 +1268,9 @@ void CL_KeyUpEvent( int key, unsigned time )
{
keys[key].repeats = 0;
keys[key].down = qfalse;
if (key != K_SCROLLOCK && key != K_KP_NUMLOCK && key != K_CAPSLOCK)
anykeydown--;
if (anykeydown < 0) {
anykeydown = 0;
}
@ -1353,6 +1355,9 @@ void Key_ClearStates (void)
anykeydown = 0;
for ( i=0 ; i < MAX_KEYS ; i++ ) {
if (i == K_SCROLLOCK || i == K_KP_NUMLOCK || i == K_CAPSLOCK)
continue;
if ( keys[i].down ) {
CL_KeyEvent( i, qfalse, 0 );

View file

@ -971,6 +971,20 @@ void IN_Frame( void )
}
}
/*
===============
IN_InitKeyLockStates
===============
*/
void IN_InitKeyLockStates( void )
{
unsigned char *keystate = SDL_GetKeyState(NULL);
keys[K_SCROLLOCK].down = keystate[SDLK_SCROLLOCK];
keys[K_KP_NUMLOCK].down = keystate[SDLK_NUMLOCK];
keys[K_CAPSLOCK].down = keystate[SDLK_CAPSLOCK];
}
/*
===============
IN_Init
@ -1021,6 +1035,8 @@ void IN_Init( void )
Cvar_SetValue( "com_unfocused", !( appState & SDL_APPINPUTFOCUS ) );
Cvar_SetValue( "com_minimized", !( appState & SDL_APPACTIVE ) );
IN_InitKeyLockStates( );
IN_InitJoystick( );
Com_DPrintf( "------------------------------------\n" );
}