From 1c3dde51901c8ca93b104704ebfa03eeaeb3c2d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= Date: Mon, 26 Oct 2020 16:17:03 +0100 Subject: [PATCH] Handle csfml wheel --- main_csfml.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/main_csfml.c b/main_csfml.c index d109f58..db6d486 100644 --- a/main_csfml.c +++ b/main_csfml.c @@ -43,6 +43,7 @@ sfClock *clock; sfRenderWindow* window; uint8_t musicOn = 0; +int8_t mouseWheelState = 0; int8_t SFG_keyPressed(uint8_t key) { @@ -71,33 +72,29 @@ int8_t SFG_keyPressed(uint8_t key) break; case SFG_KEY_NEXT_WEAPON: -/* TODO - if (sdlKeyboardState[SDL_SCANCODE_P] || sdlKeyboardState[SDL_SCANCODE_X]) + if (k(P) || k(X)) return 1; - if (sdlMouseWheelState > 0) + if (mouseWheelState > 0) { - sdlMouseWheelState--; + mouseWheelState--; return 1; } - */ + return 0; break; case SFG_KEY_PREVIOUS_WEAPON: -/* TODO - if (sdlKeyboardState[SDL_SCANCODE_O] || sdlKeyboardState[SDL_SCANCODE_Y] - || sdlKeyboardState[SDL_SCANCODE_Z]) + if (k(O) || k(Y) || k(Z)) return 1; - if (sdlMouseWheelState < 0) + if (mouseWheelState < 0) { - sdlMouseWheelState++; + mouseWheelState++; return 1; } return 0; -*/ break; case SFG_KEY_MENU: return sfKeyboard_isKeyPressed(sfKeyEscape); break; @@ -296,6 +293,8 @@ int main() while (sfRenderWindow_pollEvent(window,&event)) if (event.type == sfEvtClosed) sfRenderWindow_close(window); + else if (event.type == sfEvtMouseWheelMoved) + mouseWheelState = event.mouseWheel.delta; if (!SFG_mainLoopBody()) break;