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

Revert "attempt to run server in a separate app"

Browse Source 
This reverts commit 99fe55b295ad95033626c15011cfe49779269156.
This commit is contained in:
Andrey Filipenkov
2022-07-26 16:16:37 +03:00
parent e61e283b75
commit de05479532
3 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
client/CServerHandler.cpp
View File

@@ -23,7 +23,10 @@
#ifdef VCMI_ANDROID
#include "../lib/CAndroidVMHelper.h"
#elif !defined(VCMI_IOS)
#elif defined(VCMI_IOS)
#include "../server/CVCMIServer.h"
// todo ios
#else
#include "../lib/Interprocess.h"
#endif
#include "../lib/CConfigHandler.h"
@@ -182,7 +185,18 @@ void CServerHandler::startLocalServerAndConnect()
envHelper.callStaticVoidMethod(CAndroidVMHelper::NATIVE_METHODS_DEFAULT_CLASS, "startServer", true);
}
#elif defined(VCMI_IOS)
// todo 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");
#else
threadRunLocalServer = std::make_shared<boost::thread>(&CServerHandler::threadRunServer, this); //runs server executable;
#endif
@@ -201,6 +215,13 @@ void CServerHandler::startLocalServerAndConnect()
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");
}
#else
if(shm)
shm->sr->waitTillReady();