From b899da315d7c0c81a4f1f51deb52c6ac1748f7c8 Mon Sep 17 00:00:00 2001 From: Peter Veenstra Date: Fri, 28 Dec 2018 12:18:12 +0000 Subject: [PATCH] use right field when dealing with joysticks. use enum instead of magic value (ny00123) Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4179 --- src/gui/sdl_mapper.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/sdl_mapper.cpp b/src/gui/sdl_mapper.cpp index 2e6f7def..db8a4ea9 100644 --- a/src/gui/sdl_mapper.cpp +++ b/src/gui/sdl_mapper.cpp @@ -712,7 +712,7 @@ public: if (abs(event->jaxis.value)<25000) return 0; return CreateAxisBind(event->jaxis.axis,event->jaxis.value>0); } else if (event->type==SDL_JOYBUTTONDOWN) { - if (event->button.which!=stick) return 0; + if (event->jbutton.which!=stick) return 0; #if defined (REDUCE_JOYSTICK_POLLING) return CreateButtonBind(event->jbutton.button%button_wrap); #else @@ -1690,7 +1690,7 @@ static void SetActiveEvent(CEvent * event) { } static void DrawButtons(void) { - SDL_FillRect(mapper.surface,0,0); + SDL_FillRect(mapper.surface,0,CLR_BLACK); SDL_LockSurface(mapper.surface); for (CButton_it but_it = buttons.begin();but_it!=buttons.end();but_it++) { (*but_it)->Draw();