abort ANY movetype_walk move once a touch function moved the player

[xonotic/darkplaces.git] / vid_sdl.c

diff --git a/vid_sdl.c b/vid_sdl.c
index 5fd6230bc5f380007b764a94bb727229cadfc440..56d1ad6129505c5701d37550b388d899d0baebf4 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -373,7 +373,7 @@ void Sys_SendKeyEvents( void )
                                Key_Event( MapKey( event.key.keysym.sym ), (char)event.key.keysym.unicode, (event.key.state == SDL_PRESSED) );
                                break;
                        case SDL_ACTIVEEVENT:
-                               if( event.active.state == SDL_APPACTIVE )
+                               if( event.active.state & SDL_APPACTIVE )
                                {
                                        if( event.active.gain )
                                                vid_hidden = false;
@@ -537,7 +537,7 @@ static void VID_SetIcon()
 
        for(i = 0; i < colors; ++i)
        {
-               int r, g, b;
+               unsigned int r, g, b;
                char idx;
 
                if(sscanf(idata[i+1], "%c c #%02x%02x%02x", &idx, &r, &g, &b) != 4)