MapleShrine/mkxp
1
0
Fork 0
Code Issues 32 Pull requests 11 Projects Releases Wiki Activity

Rename 'resetInput' to 'resetInputStates'

Browse source
This commit is contained in:
Jonas Kulla 2013-09-04 12:10:21 +02:00
parent d0fa2dd37a
commit a75dea3ffe
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/eventthread.cpp
View file

@ -93,7 +93,7 @@ void EventThread::process(RGSSThreadData &rtData)
break; break;
case SDL_WINDOWEVENT_FOCUS_LOST : case SDL_WINDOWEVENT_FOCUS_LOST :
resetInput(); resetInputStates();
break; break;
} }
break; break;
@ -159,7 +159,7 @@ void EventThread::process(RGSSThreadData &rtData)
break; break;
case SDL_JOYDEVICEREMOVED : case SDL_JOYDEVICEREMOVED :
resetInput(); resetInputStates();
break; break;
case SDL_MOUSEBUTTONDOWN : case SDL_MOUSEBUTTONDOWN :
@ -196,7 +196,7 @@ void EventThread::cleanup()
} }
} }
void EventThread::resetInput() void EventThread::resetInputStates()
{ {
memset(&keyStates, 0, sizeof(keyStates)); memset(&keyStates, 0, sizeof(keyStates));
memset(&joyState, 0, sizeof(joyState)); memset(&joyState, 0, sizeof(joyState));
@ -250,7 +250,7 @@ void EventThread::showMessageBox(const char *body, int flags)
/* Keep repainting screen while box is open */ /* Keep repainting screen while box is open */
gState->graphics().repaintWait(&msgBoxDone); gState->graphics().repaintWait(&msgBoxDone);
/* Prevent endless loops */ /* Prevent endless loops */
resetInput(); resetInputStates();
} }
bool EventThread::getFullscreen() bool EventThread::getFullscreen()

2
src/eventthread.h
View file

@ -77,7 +77,7 @@ public:
void showMessageBox(const char *body, int flags = 0); void showMessageBox(const char *body, int flags = 0);
private: private:
void resetInput(); void resetInputStates();
void setFullscreen(SDL_Window *, bool mode); void setFullscreen(SDL_Window *, bool mode);
bool fullscreen; bool fullscreen;
volatile bool msgBoxDone; volatile bool msgBoxDone;