From 630e8e9b249683d55ea806c9987603b692471bdc Mon Sep 17 00:00:00 2001 From: Iliyas Jorio Date: Sun, 18 Jul 2021 13:12:30 +0200 Subject: [PATCH] Move {Init,Hide,Show}Cursor to SDLInput.cpp --- src/Input/SDLInput.cpp | 24 ++++++++++++++++++++++-- src/Pomme.cpp | 20 -------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/Input/SDLInput.cpp b/src/Input/SDLInput.cpp index e665623..d87e9cf 100644 --- a/src/Input/SDLInput.cpp +++ b/src/Input/SDLInput.cpp @@ -190,10 +190,30 @@ void GetMouse(Point* mouseLoc) Boolean Button(void) { - ONCE(TODOMINOR()); - return false; + return SDL_GetMouseState(NULL, NULL) & SDL_BUTTON_LMASK; } +//----------------------------------------------------------------------------- +// Mouse cursor + +void InitCursor() +{ + SDL_ShowCursor(1); +} + +void HideCursor() +{ + SDL_ShowCursor(0); +} + +void ShowCursor() +{ + SDL_ShowCursor(1); +} + +//----------------------------------------------------------------------------- +// Init + void Pomme::Input::Init() { InitScancodeLookupTable(); diff --git a/src/Pomme.cpp b/src/Pomme.cpp index 142e4f3..9e450de 100644 --- a/src/Pomme.cpp +++ b/src/Pomme.cpp @@ -8,8 +8,6 @@ #include "PommeSound.h" #include "PommeInput.h" -#include "SDL.h" - #if _WIN32 #include "Platform/Windows/PommeWindows.h" #endif @@ -44,24 +42,6 @@ void FlushEvents(short, short) TODOMINOR(); } -//----------------------------------------------------------------------------- -// Mouse cursor - -void InitCursor() -{ - SDL_ShowCursor(1); -} - -void HideCursor() -{ - SDL_ShowCursor(0); -} - -void ShowCursor() -{ - SDL_ShowCursor(1); -} - //----------------------------------------------------------------------------- // Our own init