Core/Common: Merge TimeTrackerSmall with TimeTracker

(cherry picked from commit 228696bf80)
This commit is contained in:
Carbenium
2020-07-29 00:16:15 +02:00
committed by Shauren
parent 35e0002df3
commit 8809d54ca2
15 changed files with 30 additions and 70 deletions

View File

@@ -3026,7 +3026,7 @@ class TC_GAME_API Player : public Unit, public GridObject<Player>
std::array<std::unique_ptr<CUFProfile>, MAX_CUF_PROFILES> _CUFProfiles;
TimeTrackerSmall m_groupUpdateTimer;
TimeTracker m_groupUpdateTimer;
private:
// internal common parts for CanStore/StoreItem functions

View File

@@ -118,7 +118,7 @@ class TC_GAME_API Transport : public GameObject, public TransportBase
KeyFrameVec::const_iterator _currentFrame;
KeyFrameVec::const_iterator _nextFrame;
TimeTrackerSmall _positionChangeTimer;
TimeTracker _positionChangeTimer;
bool _isMoving;
bool _pendingStop;

View File

@@ -1981,7 +1981,7 @@ class TC_GAME_API Unit : public WorldObject
private:
uint32 m_state; // Even derived shouldn't modify
TimeTrackerSmall m_splineSyncTimer;
TimeTracker m_splineSyncTimer;
Diminishing m_Diminishing;

View File

@@ -458,7 +458,7 @@ class TC_GAME_API Group
uint32 m_maxEnchantingLevel;
uint32 m_dbStoreId; // Represents the ID used in database (Can be reused by other groups if group was disbanded)
bool m_isLeaderOffline;
TimeTrackerSmall m_leaderOfflineTimer;
TimeTracker m_leaderOfflineTimer;
// Ready Check
bool m_readyCheckStarted;

View File

@@ -51,7 +51,7 @@ class ChaseMovementGenerator : public MovementGenerator, public AbstractFollower
std::unique_ptr<PathGenerator> _path;
Optional<Position> _lastTargetPosition;
TimeTrackerSmall _rangeCheckTimer;
TimeTracker _rangeCheckTimer;
bool _movingTowards = true;
bool _mutualChase = true;
};

View File

@@ -53,7 +53,7 @@ class FollowMovementGenerator : public MovementGenerator, public AbstractFollowe
float const _range;
ChaseAngle const _angle;
TimeTrackerSmall _checkTimer;
TimeTracker _checkTimer;
std::unique_ptr<PathGenerator> _path;
Optional<Position> _lastTargetPosition;
};

View File

@@ -51,7 +51,7 @@ class FormationMovementGenerator : public MovementGeneratorMedium<Creature, Form
bool _hasPredictedDestination;
Position _lastLeaderPosition;
TimeTrackerSmall _nextMoveTimer;
TimeTracker _nextMoveTimer;
};
#endif // TRINITY_FORMATIONMOVEMENTGENERATOR_H

View File

@@ -45,7 +45,7 @@ class GenericMovementGenerator : public MovementGenerator
Movement::MoveSplineInit _splineInit;
MovementGeneratorType _type;
uint32 _pointId;
TimeTrackerSmall _duration;
TimeTracker _duration;
uint32 _arrivalSpellId;
ObjectGuid _arrivalSpellTargetGuid;

View File

@@ -68,7 +68,7 @@ class WaypointMovementGenerator<Creature> : public MovementGeneratorMedium<Creat
return false;
}
TimeTrackerSmall _nextMoveTime;
TimeTracker _nextMoveTime;
uint32 _pathId;
bool _repeating;
bool _loadedFromDB;

View File

@@ -236,7 +236,7 @@ struct npc_wisp_invis : public ScriptedAI
}
private:
TimeTrackerSmall _timer;
TimeTracker _timer;
uint32 _creatureType;
uint32 _firstSpell;
uint32 _secondSpell;
@@ -428,7 +428,7 @@ private:
}
TaskScheduler _scheduler;
TimeTrackerSmall _laughTimer;
TimeTracker _laughTimer;
ObjectGuid _bodyGUID;
uint32 _phase;
bool _withBody;
@@ -807,7 +807,7 @@ private:
InstanceScript* _instance;
TaskScheduler _scheduler;
TimeTrackerSmall _laughTimer;
TimeTracker _laughTimer;
ObjectGuid _headGUID;
uint32 _phase;
uint32 _id;

View File

@@ -153,7 +153,7 @@ struct boss_high_inquisitor_fairbanks : public BossAI
}
private:
TimeTrackerSmall _healTimer;
TimeTracker _healTimer;
bool _powerWordShield;
};

View File

@@ -232,7 +232,7 @@ public:
}
private:
TimeTrackerSmall _killYellTimer;
TimeTracker _killYellTimer;
bool _fakeDeath;
bool _canDie;
};
@@ -427,7 +427,7 @@ private:
InstanceScript* _instance;
EventMap _events;
TaskScheduler _scheduler;
TimeTrackerSmall _killYellTimer;
TimeTracker _killYellTimer;
bool _ressurectionInProgress;
bool _canDie;
};