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

use copy construction to pass the config along so the main constructor gets run once.

Browse source
This commit is contained in:
Edward Rudd 2013-12-31 17:23:15 -05:00
parent f2bb0b2e79
commit f8e8d704b5
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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 =