From a3c90248a7cfe1a08a7fc8848481cc5ca97e462b Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Thu, 26 Apr 2018 02:52:49 +0300 Subject: [PATCH] Remove unneeded argument in SDLash_KeyEvent. Remove copypasted code --- engine/platform/sdl/events.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/engine/platform/sdl/events.c b/engine/platform/sdl/events.c index 63950070..64e4010c 100644 --- a/engine/platform/sdl/events.c +++ b/engine/platform/sdl/events.c @@ -40,8 +40,9 @@ SDLash_KeyEvent ============= */ -static void SDLash_KeyEvent( SDL_KeyboardEvent key, int down ) +static void SDLash_KeyEvent( SDL_KeyboardEvent key ) { + int down = key.state != SDL_RELEASED; int keynum = key.keysym.scancode; qboolean numLock = SDL_GetModState() & KMOD_NUM; @@ -162,7 +163,7 @@ SDLash_MouseEvent */ static void SDLash_MouseEvent( SDL_MouseButtonEvent button ) { - int down = button.type == SDL_MOUSEBUTTONDOWN ? 1 : 0; + int down = button.state != SDL_RELEASED; if( in_mouseinitialized && !m_ignore->value && button.which != SDL_TOUCH_MOUSEID ) { Key_Event( K_MOUSE1 - 1 + button.button, down ); @@ -238,18 +239,9 @@ static void SDLash_EventFilter( SDL_Event *event ) break; case SDL_MOUSEBUTTONUP: -#ifdef TOUCHEMU - mdown = 0; - IN_TouchEvent( event_up, 0, - event->button.x/scr_width->value, - event->button.y/scr_height->value, 0, 0); -#else - SDLash_MouseEvent( event->button ); -#endif - break; case SDL_MOUSEBUTTONDOWN: #ifdef TOUCHEMU - mdown = 1; + mdown = event->button.state != SDL_RELEASED; IN_TouchEvent( event_down, 0, event->button.x/scr_width->value, event->button.y/scr_height->value, 0, 0); @@ -265,11 +257,8 @@ static void SDLash_EventFilter( SDL_Event *event ) /* Keyboard events */ case SDL_KEYDOWN: - SDLash_KeyEvent( event->key, 1 ); - break; - case SDL_KEYUP: - SDLash_KeyEvent( event->key, 0 ); + SDLash_KeyEvent( event->key ); break;