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

Merge #8

Browse source
This commit is contained in:
Jonas Kulla 2014-01-02 00:11:57 +01:00
commit a0a27889a3
22 changed files with 602 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/eventthread.cpp
View file

@ -70,6 +70,7 @@ void EventThread::process(RGSSThreadData &rtData)
WindowSizeNotify &windowSizeMsg = rtData.windowSizeMsg;
fullscreen = rtData.config.fullscreen;
int toggleFSMod = rtData.config.anyAltToggleFS ? KMOD_ALT : KMOD_LALT;
fps.lastFrame = SDL_GetPerformanceCounter();
fps.displaying = false;
@ -151,7 +152,7 @@ void EventThread::process(RGSSThreadData &rtData)
case SDL_KEYDOWN :
if (event.key.keysym.scancode == SDL_SCANCODE_RETURN &&
(event.key.keysym.mod & KMOD_LALT))
(event.key.keysym.mod & toggleFSMod))
{
setFullscreen(win, !fullscreen);
if (!fullscreen && havePendingTitle)