games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

todo updates

Browse Source
This commit is contained in:
Andrey Filipenkov
2021-03-13 14:13:16 +03:00
parent d2b1cc00e8
commit dde9a5d5d2
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/CServerHandler.cpp
View File

@@ -23,9 +23,7 @@
#ifdef VCMI_ANDROID #ifdef VCMI_ANDROID
#include "../lib/CAndroidVMHelper.h" #include "../lib/CAndroidVMHelper.h"
#elif defined(VCMI_IOS) #elif !defined(VCMI_IOS)
//TODO
#else
#include "../lib/Interprocess.h" #include "../lib/Interprocess.h"
#endif #endif
#include "../lib/CConfigHandler.h" #include "../lib/CConfigHandler.h"
@@ -184,7 +182,7 @@ void CServerHandler::startLocalServerAndConnect()
envHelper.callStaticVoidMethod(CAndroidVMHelper::NATIVE_METHODS_DEFAULT_CLASS, "startServer", true); envHelper.callStaticVoidMethod(CAndroidVMHelper::NATIVE_METHODS_DEFAULT_CLASS, "startServer", true);
} }
#elif defined(VCMI_IOS) #elif defined(VCMI_IOS)
// TODO // todo ios
#else #else
threadRunLocalServer = std::make_shared<boost::thread>(&CServerHandler::threadRunServer, this); //runs server executable; threadRunLocalServer = std::make_shared<boost::thread>(&CServerHandler::threadRunServer, this); //runs server executable;
#endif #endif
@@ -202,7 +200,7 @@ void CServerHandler::startLocalServerAndConnect()
logNetwork->info("waiting for server finished..."); logNetwork->info("waiting for server finished...");
androidTestServerReadyFlag = false; androidTestServerReadyFlag = false;
#elif defined(VCMI_IOS) #elif defined(VCMI_IOS)
//TODO // todo ios
#else #else
if(shm) if(shm)
shm->sr->waitTillReady(); shm->sr->waitTillReady();

3
lib/serializer/Connection.cpp
View File

@@ -71,7 +71,8 @@ CConnection::CConnection(std::string host, ui16 port, std::string Name, std::str
boost::system::error_code error = asio::error::host_not_found; boost::system::error_code error = asio::error::host_not_found;
socket = std::make_shared<tcp::socket>(*io_service); socket = std::make_shared<tcp::socket>(*io_service);
tcp::resolver resolver(*io_service); tcp::resolver resolver(*io_service);
tcp::resolver::iterator end, pom, endpoint_iterator = resolver.resolve(tcp::resolver::query(host, std::to_string(port)),error); // todo ios: is new param really needed?
tcp::resolver::iterator end, pom, endpoint_iterator = resolver.resolve(tcp::resolver::query(host, std::to_string(port), resolver_query_base::numeric_service), error);
if(error) if(error)
{ {
logNetwork->error("Problem with resolving: \n%s", error.message()); logNetwork->error("Problem with resolving: \n%s", error.message());

4
server/CVCMIServer.cpp
View File

@@ -29,9 +29,7 @@
#include "../lib/rmg/CMapGenOptions.h" #include "../lib/rmg/CMapGenOptions.h"
#ifdef VCMI_ANDROID #ifdef VCMI_ANDROID
#include "lib/CAndroidVMHelper.h" #include "lib/CAndroidVMHelper.h"
#elif defined(VCMI_IOS) #elif !defined(VCMI_IOS)
// todo ios
#else
#include "../lib/Interprocess.h" #include "../lib/Interprocess.h"
#endif #endif
#include "../lib/VCMI_Lib.h" #include "../lib/VCMI_Lib.h"