Rebase resync

This commit is contained in:
Antz 2020-02-17 09:19:44 +00:00
parent a0797532e8
commit 1997c1e903
3106 changed files with 11118 additions and 627576 deletions

View file

@ -27,11 +27,16 @@
template<class T>
void ConfusedMovementGenerator<T>::Initialize(T& unit)
{
unit.addUnitState(UNIT_STAT_CONFUSED);
// set initial position
unit.GetPosition(i_x, i_y, i_z);
if (!unit.isAlive() || unit.hasUnitState(UNIT_STAT_NOT_MOVE))
return;
unit.StopMoving();
unit.addUnitState(UNIT_STAT_CONFUSED | UNIT_STAT_CONFUSED_MOVE);
unit.addUnitState(UNIT_STAT_CONFUSED_MOVE);
}
template<class T>
@ -45,6 +50,10 @@ template<class T>
void ConfusedMovementGenerator<T>::Reset(T& unit)
{
i_nextMoveTime.Reset(0);
if (!unit.isAlive() || unit.hasUnitState(UNIT_STAT_NOT_MOVE))
return;
unit.StopMoving();
unit.addUnitState(UNIT_STAT_CONFUSED | UNIT_STAT_CONFUSED_MOVE);
}