games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

attempt to run server in a separate app

Browse Source 
partially reverts 3258f8bb40487e3731bf452dbda1add6294ff4b2
This commit is contained in:
Andrey Filipenkov
2021-03-07 15:18:40 +03:00
parent 26a1cc5b73
commit e72e5cea6f
9 changed files with 109 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
client/CServerHandler.cpp
View File

@@ -24,8 +24,7 @@
#ifdef VCMI_ANDROID
#include "../lib/CAndroidVMHelper.h"
#elif defined(VCMI_IOS)
#include "../server/CVCMIServer.h"
// todo ios
//TODO
#else
#include "../lib/Interprocess.h"
#endif
@@ -185,18 +184,7 @@ void CServerHandler::startLocalServerAndConnect()
envHelper.callStaticVoidMethod(CAndroidVMHelper::NATIVE_METHODS_DEFAULT_CLASS, "startServer", true);
}
#elif defined(VCMI_IOS)
// todo ios: hide keyboard
logNetwork->info("[ios] create server thread");
boost::condition_variable cond;
threadRunLocalServer = std::make_shared<boost::thread>([&cond, this] {
setThreadName("CVCMIServer");
CVCMIServer::create(&cond);
// todo ios copypaste
threadRunLocalServer.reset();
CSH->campaignServerRestartLock.setn(false);
});
// threadRunLocalServer->detach();
logNetwork->info("[ios] detach server thread");
// TODO
#else
threadRunLocalServer = std::make_shared<boost::thread>(&CServerHandler::threadRunServer, this); //runs server executable;
#endif
@@ -214,14 +202,7 @@ void CServerHandler::startLocalServerAndConnect()
logNetwork->info("waiting for server finished...");
androidTestServerReadyFlag = false;
#elif defined(VCMI_IOS)
// todo ios
{
boost::mutex m;
boost::unique_lock<boost::mutex> lock{m};
logNetwork->info("[ios] wait for server");
cond.wait(lock);
logNetwork->info("[ios] server ready");
}
//TODO
#else
if(shm)
shm->sr->waitTillReady();