games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-31 22:05:10 +02:00
Code Issues Releases Activity

todos

Browse Source
This commit is contained in:
Andrey Filipenkov 2021-03-07 19:18:26 +03:00
parent 98d507d0a5
commit 26a1cc5b73
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/CStopWatch.h
View File

@ -53,7 +53,7 @@ public:
private: private:
si64 clock() si64 clock()
{ {
#ifdef __FreeBSD__ #ifdef __FreeBSD__ // TODO: enable also for Apple?
struct rusage usage; struct rusage usage;
getrusage(RUSAGE_SELF, &usage); getrusage(RUSAGE_SELF, &usage);
return static_cast<si64>(usage.ru_utime.tv_sec + usage.ru_stime.tv_sec) * 1000000 + usage.ru_utime.tv_usec + usage.ru_stime.tv_usec; return static_cast<si64>(usage.ru_utime.tv_sec + usage.ru_stime.tv_sec) * 1000000 + usage.ru_utime.tv_usec + usage.ru_stime.tv_usec;

4
server/CVCMIServer.cpp
View File

@ -916,7 +916,7 @@ int main(int argc, char * argv[])
signal(SIGSEGV, handleLinuxSignal); signal(SIGSEGV, handleLinuxSignal);
#endif #endif
// todo ios: double console log // todo ios: double console log in single-process mode. Why removing the lines below breaks connecting to local server?!
console = new CConsoleHandler(); console = new CConsoleHandler();
CBasicLogConfigurator logConfig(VCMIDirs::get().userLogsPath() / "VCMI_Server_log.txt", console); CBasicLogConfigurator logConfig(VCMIDirs::get().userLogsPath() / "VCMI_Server_log.txt", console);
logConfig.configureDefault(); logConfig.configureDefault();
@ -927,7 +927,6 @@ int main(int argc, char * argv[])
argc = 1; argc = 1;
boost::condition_variable * cond = reinterpret_cast<boost::condition_variable *>(argv[1]); boost::condition_variable * cond = reinterpret_cast<boost::condition_variable *>(argv[1]);
cond->notify_one(); cond->notify_one();
//#endif
#else #else
handleCommandOptions(argc, argv, opts); handleCommandOptions(argc, argv, opts);
preinitDLL(console); preinitDLL(console);
@ -936,7 +935,6 @@ int main(int argc, char * argv[])
loadDLLClasses(); loadDLLClasses();
srand((ui32)time(nullptr)); srand((ui32)time(nullptr));
//#ifdef VCMI_IOS
#endif #endif
try try
{ {