games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-17 01:32:21 +02:00
Code Issues Releases Activity

Merged changes from upstream and fixed compilation caused by API changes

Browse Source
This commit is contained in:
Ivan Savenko
2014-06-03 22:45:18 +03:00
parent dc7f820161 a94b7e0986
commit 32b6568b65
143 changed files with 8788 additions and 8457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/CMT.cpp
View File

@ -284,6 +284,10 @@ int main(int argc, char** argv)
logGlobal->infoStream() << "Creating console and configuring logger: " << pomtime.getDiff();
logGlobal->infoStream() << "The log file will be saved to " << logPath;
#ifdef __ANDROID__
// boost will crash without this
setenv("LANG", "C", 1);
#endif
// Init filesystem and settings
preinitDLL(::console);
settings.init();
@ -361,8 +365,13 @@ int main(int argc, char** argv)
#ifndef __ANDROID__
//we can properly play intro only in the main thread, so we have to move loading to the separate thread
boost::thread loading(init);
#else
// on Android threaded init is broken
init();
#endif
if(!gNoGUI )
{
@ -372,7 +381,9 @@ int main(int argc, char** argv)
}
CSDL_Ext::update(screen);
#ifndef __ANDROID__
loading.join();
#endif
logGlobal->infoStream()<<"Initialization of VCMI (together): "<<total.getDiff();
if(!vm.count("battle"))