From 947974cac649769a9c569162e5f16022896a2652 Mon Sep 17 00:00:00 2001 From: Jonas Kulla Date: Tue, 12 Dec 2017 17:57:02 +0100 Subject: [PATCH 1/3] Config: Properly use windowTitle everywhere instead of game.title --- src/eventthread.cpp | 8 ++++---- src/main.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/eventthread.cpp b/src/eventthread.cpp index 08b6c29..6ffdb29 100644 --- a/src/eventthread.cpp +++ b/src/eventthread.cpp @@ -296,14 +296,14 @@ void EventThread::process(RGSSThreadData &rtData) if (fullscreen) { /* Prevent fullscreen flicker */ - strncpy(pendingTitle, rtData.config.game.title.c_str(), + strncpy(pendingTitle, rtData.config.windowTitle.c_str(), sizeof(pendingTitle)); havePendingTitle = true; break; } - SDL_SetWindowTitle(win, rtData.config.game.title.c_str()); + SDL_SetWindowTitle(win, rtData.config.windowTitle.c_str()); } break; @@ -410,7 +410,7 @@ void EventThread::process(RGSSThreadData &rtData) case REQUEST_MESSAGEBOX : SDL_ShowSimpleMessageBox(event.user.code, - rtData.config.game.title.c_str(), + rtData.config.windowTitle.c_str(), (const char*) event.user.data1, win); free(event.user.data1); msgBoxDone.set(); @@ -429,7 +429,7 @@ void EventThread::process(RGSSThreadData &rtData) break; snprintf(buffer, sizeof(buffer), "%s - %d FPS", - rtData.config.game.title.c_str(), event.user.code); + rtData.config.windowTitle.c_str(), event.user.code); /* Updating the window title in fullscreen * mode seems to cause flickering */ diff --git a/src/main.cpp b/src/main.cpp index 40ae391..e457639 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -353,13 +353,13 @@ int main(int argc, char *argv[]) if (rtData.rqTermAck) SDL_WaitThread(rgssThread, 0); else - SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, conf.game.title.c_str(), + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, conf.windowTitle.c_str(), "The RGSS script seems to be stuck and mkxp will now force quit", win); if (!rtData.rgssErrorMsg.empty()) { Debug() << rtData.rgssErrorMsg; - SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, conf.game.title.c_str(), + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, conf.windowTitle.c_str(), rtData.rgssErrorMsg.c_str(), win); } From 7902d0942d17627e2ada58bfa3ce1898003c951d Mon Sep 17 00:00:00 2001 From: Jonas Kulla Date: Tue, 12 Dec 2017 22:45:01 +0100 Subject: [PATCH 2/3] Filesystem: Properly iterate top level dir entries "." seemed to have worked in earlier PhysFS versions, but it was never the correct way. --- src/filesystem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/filesystem.cpp b/src/filesystem.cpp index f27b3bd..8e50ee8 100644 --- a/src/filesystem.cpp +++ b/src/filesystem.cpp @@ -523,7 +523,7 @@ void FileSystem::initFontSets(SharedFontState &sfs) { FontSetsCBData d = { p, &sfs }; - PHYSFS_enumerate(".", findFontsFolderCB, &d); + PHYSFS_enumerate("", findFontsFolderCB, &d); } struct OpenReadEnumData From 183ebbed65687c4074b8431765b7d6ac4d8d2d35 Mon Sep 17 00:00:00 2001 From: Jonas Kulla Date: Tue, 12 Dec 2017 22:46:25 +0100 Subject: [PATCH 3/3] RGSSAD: Fix parsing of top level directory entries We were spamming every path into the hash (including the top level ones) without noticing... oh well. --- src/rgssad.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/rgssad.cpp b/src/rgssad.cpp index 4b51472..ac8772a 100644 --- a/src/rgssad.cpp +++ b/src/rgssad.cpp @@ -297,6 +297,8 @@ processDirectories(RGSS_archiveData *data, BoostSet &topLevel, if (slash) nameBuf[i] = '/'; + + break; } /* Check for more entries */