This commit is contained in:
Jonas Kulla 2014-01-01 12:56:45 +01:00
parent 7a1dd2588d
commit 1bacceddf0
11 changed files with 34 additions and 1 deletions

View file

@ -1287,6 +1287,7 @@ struct AudioStream
throw e;
}
}
break;
}

View file

@ -113,26 +113,31 @@ void EventThread::process(RGSSThreadData &rtData)
case SDL_WINDOWEVENT_ENTER :
cursorInWindow = true;
updateCursorState(cursorInWindow && windowFocused);
break;
case SDL_WINDOWEVENT_LEAVE :
cursorInWindow = false;
updateCursorState(cursorInWindow && windowFocused);
break;
case SDL_WINDOWEVENT_CLOSE :
terminate = true;
break;
case SDL_WINDOWEVENT_FOCUS_GAINED :
windowFocused = true;
updateCursorState(cursorInWindow && windowFocused);
break;
case SDL_WINDOWEVENT_FOCUS_LOST :
windowFocused = false;
updateCursorState(cursorInWindow && windowFocused);
resetInputStates();
break;
}
break;
@ -141,6 +146,7 @@ void EventThread::process(RGSSThreadData &rtData)
case REQUEST_TERMINATION :
terminate = true;
Debug() << "EventThread termination requested";
break;
case SDL_KEYDOWN :
@ -175,6 +181,7 @@ void EventThread::process(RGSSThreadData &rtData)
strncpy(pendingTitle, rtData.config.game.title.c_str(),
sizeof(pendingTitle));
havePendingTitle = true;
break;
}
@ -204,11 +211,13 @@ void EventThread::process(RGSSThreadData &rtData)
(const char*) event.user.data1, win);
free(event.user.data1);
msgBoxDone = true;
break;
case REQUEST_SETCURSORVISIBLE :
showCursor = event.user.code;
updateCursorState(cursorInWindow);
break;
case UPDATE_FPS :
@ -224,6 +233,7 @@ void EventThread::process(RGSSThreadData &rtData)
{
strncpy(pendingTitle, buffer, sizeof(pendingTitle));
havePendingTitle = true;
break;
}
@ -272,6 +282,7 @@ void EventThread::process(RGSSThreadData &rtData)
case SDL_MOUSEMOTION :
mouseState.x = event.motion.x;
mouseState.y = event.motion.y;
break;
}

View file

@ -316,6 +316,7 @@ RGSS_openArchive(PHYSFS_Io *io, const char *, int forWrite)
/* Read filename length,
* if nothing was read, no files remain */
uint32_t nameLen;
if (!readUint32(io, nameLen))
break;

View file

@ -874,7 +874,7 @@ struct TilemapPrivate
continue;
VBO::uploadSubData(k*quadDataSize(bufferFrameQuadCount) + quadDataSize(scanrowBases[i]),
quadDataSize(scanrowSize(i)), &scanrowVert[i].v[k][0]);
quadDataSize(scanrowSize(i)), &scanrowVert[i].v[k][0]);
}
}