games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-17 00:07:41 +02:00
Code Issues Releases Activity

Use API identical to std classes where possible

Browse Source
This commit is contained in:
Ivan Savenko
2023-08-20 23:45:41 +03:00
parent 87957e74c1
commit 44d16b32fe
32 changed files with 72 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/CGameHandler.cpp
View File

@ -66,10 +66,6 @@
#include <vcmi/events/GenericEvents.h>
#include <vcmi/events/AdventureEvents.h>
#ifndef _MSC_VER
#include <boost/thread/xtime.hpp>
#endif
#define COMPLAIN_RET_IF(cond, txt) do {if (cond){complain(txt); return;}} while(0)
#define COMPLAIN_RET_FALSE_IF(cond, txt) do {if (cond){complain(txt); return false;}} while(0)
#define COMPLAIN_RET(txt) {complain(txt); return false;}
@ -973,7 +969,6 @@ void CGameHandler::run(bool resume)
{
LOG_TRACE_PARAMS(logGlobal, "resume=%d", resume);
using namespace boost::posix_time;
for (auto cc : lobby->connections)
{
auto players = lobby->getAllClientPlayers(cc->connectionID);
@ -1068,8 +1063,7 @@ void CGameHandler::run(bool resume)
if(gs->curB)
turnTimerHandler.onBattleLoop(waitTime);
static time_duration p = milliseconds(waitTime);
states.cv.timed_wait(lock, p);
states.cv.wait_for(lock, boost::chrono::milliseconds(waitTime));
}
}
}
@ -2575,7 +2569,7 @@ bool CGameHandler::upgradeCreature(ObjectInstanceID objid, SlotID pos, CreatureI
const CArmedInstance * obj = static_cast<const CArmedInstance *>(getObjInstance(objid));
if (!obj->hasStackAtSlot(pos))
{
COMPLAIN_RET("Cannot upgrade, no stack at slot " + boost::to_string(pos));
COMPLAIN_RET("Cannot upgrade, no stack at slot " + std::to_string(pos));
}
UpgradeInfo ui;
fillUpgradeInfo(obj, pos, ui);