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

Enum is now in its own namespace, comments for enum values removed

Browse Source 
Using Namespace Fix for linux compilation.


NO_OF_PHASES renamed to NUMBER_OF_PHASES, removed duplicate phase documentation
This commit is contained in:
krs
2023-03-01 17:35:20 +02:00
parent 7421fabf2c
commit 26bca26bd8
4 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/battle/CUnitState.cpp
View File

@ -609,22 +609,22 @@ bool CUnitState::waited(int turn) const
return false;
}
BattlePhases CUnitState::battleQueuePhase(int turn) const
BattlePhases::Type CUnitState::battleQueuePhase(int turn) const
{
if(turn <= 0 && waited()) //consider waiting state only for ongoing round
{
if(hadMorale)
return battle::WAIT_MORALE;
return BattlePhases::WAIT_MORALE;
else
return battle::WAIT;
return BattlePhases::WAIT;
}
else if(creatureIndex() == CreatureID::CATAPULT || isTurret()) //catapult and turrets are first
{
return battle::SIEGE;
return BattlePhases::SIEGE;
}
else
{
return battle::NORMAL;
return BattlePhases::NORMAL;
}
}