games/vcmi
1
0 Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity

Battle timer fix

Browse Source
This commit is contained in:
nordsoft committed 2023-09-02 13:14:24 +04:00
1 parent 48fb167fef
commit e85eb36bbd
1 file changed
+4 -3
Download Patch File Download Diff File Expand all files Collapse all files
server/TurnTimerHandler.cpp
+4 -3
View File
@@ -160,7 +160,7 @@ void TurnTimerHandler::onBattleStart()
std::lock_guard<std::recursive_mutex> guard(mx); std::lock_guard<std::recursive_mutex> guard(mx);
const auto * gs = gameHandler.gameState(); const auto * gs = gameHandler.gameState();
const auto * si = gameHandler.getStartInfo(); const auto * si = gameHandler.getStartInfo();
if(!si || !gs || !gs->curB || !si->turnTimerInfo.isBattleEnabled()) if(!si || !gs || !gs->curB)
return; return;
auto attacker = gs->curB->getSidePlayer(BattleSide::ATTACKER); auto attacker = gs->curB->getSidePlayer(BattleSide::ATTACKER);
@@ -174,6 +174,7 @@ void TurnTimerHandler::onBattleStart()
{ {
auto & timer = timers[i]; auto & timer = timers[i];
timer.isBattle = true; timer.isBattle = true;
timer.isActive = si->turnTimerInfo.isBattleEnabled();
timer.battleTimer = (pvpBattle ? si->turnTimerInfo.battleTimer : 0); timer.battleTimer = (pvpBattle ? si->turnTimerInfo.battleTimer : 0);
timer.creatureTimer = (pvpBattle ? si->turnTimerInfo.creatureTimer : si->turnTimerInfo.battleTimer); timer.creatureTimer = (pvpBattle ? si->turnTimerInfo.creatureTimer : si->turnTimerInfo.battleTimer);
@@ -187,7 +188,7 @@ void TurnTimerHandler::onBattleEnd()
std::lock_guard<std::recursive_mutex> guard(mx); std::lock_guard<std::recursive_mutex> guard(mx);
const auto * gs = gameHandler.gameState(); const auto * gs = gameHandler.gameState();
const auto * si = gameHandler.getStartInfo(); const auto * si = gameHandler.getStartInfo();
if(!si || !gs || !gs->curB || !si->turnTimerInfo.isBattleEnabled()) if(!si || !gs || !gs->curB)
return; return;
auto attacker = gs->curB->getSidePlayer(BattleSide::ATTACKER); auto attacker = gs->curB->getSidePlayer(BattleSide::ATTACKER);
@@ -201,7 +202,7 @@ void TurnTimerHandler::onBattleEnd()
{ {
auto & timer = timers[i]; auto & timer = timers[i];
timer.isBattle = false; timer.isBattle = false;
timer.isActive = true;
if(!pvpBattle) if(!pvpBattle)
{ {
if(si->turnTimerInfo.baseTimer && timer.baseTimer == 0) if(si->turnTimerInfo.baseTimer && timer.baseTimer == 0)