games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

cleanup

Browse Source
This commit is contained in:
AlexVinS 2014-07-02 23:53:23 +04:00
parent 9437bc52c1
commit 5a029c88d1
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
client/CMT.cpp
View File

@ -400,15 +400,18 @@ int main(int argc, char** argv)
logGlobal->infoStream()<<"\tInitializing video: "<<pomtime.getDiff();
#if defined(__ANDROID__) || !defined(VCMI_SDL1)
//on Android threaded init is broken
#define VCMI_NO_THREADED_LOAD
#endif // defined
//
//#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
#ifndef VCMI_NO_THREADED_LOAD
//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
init();
//#endif
#endif
if(!gNoGUI )
{
@ -418,9 +421,9 @@ int main(int argc, char** argv)
}
CSDL_Ext::update(screen);
//#ifndef __ANDROID__
// loading.join();
//#endif
#ifndef VCMI_NO_THREADED_LOAD
loading.join();
#endif
logGlobal->infoStream()<<"Initialization of VCMI (together): "<<total.getDiff();
if(!vm.count("battle"))