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

cmake build system + OS X support / cleanups for Humble Release #8

Merged
urkle merged 25 commits from OSX into boost 2014-01-01 23:13:17 +00:00
Conversation 2 Commits 25 Files Changed 22 +4 -3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f8e8d704b5 - Show all commits

4
src/eventthread.h
View File

@ -179,13 +179,15 @@ struct RGSSThreadData
RGSSThreadData(EventThread *ethread, RGSSThreadData(EventThread *ethread,
const char *argv0, const char *argv0,
SDL_Window *window) SDL_Window *window,
const Config& newconf)
: rqTerm(false), : rqTerm(false),
rqTermAck(false), rqTermAck(false),
ethread(ethread), ethread(ethread),
argv0(argv0), argv0(argv0),
window(window), window(window),
sizeResoRatio(1, 1), sizeResoRatio(1, 1),
config(newconf),
rqScreenshot(false) rqScreenshot(false)
{} {}
}; };

3
src/main.cpp
View File

@ -293,8 +293,7 @@ int main(int, char *argv[])
} }
EventThread eventThread; EventThread eventThread;
RGSSThreadData rtData(&eventThread, argv[0], win); RGSSThreadData rtData(&eventThread, argv[0], win, conf);
rtData.config = conf;
/* Start RGSS thread */ /* Start RGSS thread */
SDL_Thread *rgssThread = SDL_Thread *rgssThread =