diff options
author | Aokromes <jipr@hotmail.com> | 2013-10-28 09:57:48 -0700 |
---|---|---|
committer | Aokromes <jipr@hotmail.com> | 2013-10-28 09:57:48 -0700 |
commit | 5cfd180247226f404584a8927d0a9908848ab8c9 (patch) | |
tree | 116a048c21606e3b4c3d5244c0756d6a46238dd9 /src/server/game/Instances/InstanceScript.h | |
parent | cf72f7cc5cf13607dd7353b8d940d56679b6956b (diff) | |
parent | 7a7ad4a60ac2f0a082769551bb0b885a0f0d4962 (diff) |
Merge pull request #11138 from Ascathor/master
Core/Code: Unify codestyle for brackets: {} to { }.
Diffstat (limited to 'src/server/game/Instances/InstanceScript.h')
-rw-r--r-- | src/server/game/Instances/InstanceScript.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h index 943ae672046..2a2faacd200 100644 --- a/src/server/game/Instances/InstanceScript.h +++ b/src/server/game/Instances/InstanceScript.h @@ -101,7 +101,7 @@ struct MinionData struct BossInfo { - BossInfo() : state(TO_BE_DECIDED) {} + BossInfo() : state(TO_BE_DECIDED) { } EncounterState state; DoorSet door[MAX_DOOR_TYPES]; MinionSet minion; @@ -111,7 +111,7 @@ struct BossInfo struct DoorInfo { explicit DoorInfo(BossInfo* _bossInfo, DoorType _type, BoundaryType _boundary) - : bossInfo(_bossInfo), type(_type), boundary(_boundary) {} + : bossInfo(_bossInfo), type(_type), boundary(_boundary) { } BossInfo* bossInfo; DoorType type; BoundaryType boundary; @@ -119,7 +119,7 @@ struct DoorInfo struct MinionInfo { - explicit MinionInfo(BossInfo* _bossInfo) : bossInfo(_bossInfo) {} + explicit MinionInfo(BossInfo* _bossInfo) : bossInfo(_bossInfo) { } BossInfo* bossInfo; }; @@ -131,14 +131,14 @@ typedef std::map<uint32 /*entry*/, MinionInfo> MinionInfoMap; class InstanceScript : public ZoneScript { public: - explicit InstanceScript(Map* map) : instance(map), completedEncounters(0) {} + explicit InstanceScript(Map* map) : instance(map), completedEncounters(0) { } - virtual ~InstanceScript() {} + virtual ~InstanceScript() { } Map* instance; //On creation, NOT load. - virtual void Initialize() {} + virtual void Initialize() { } //On load virtual void Load(char const* data) { LoadBossState(data); } @@ -148,14 +148,14 @@ class InstanceScript : public ZoneScript void SaveToDB(); - virtual void Update(uint32 /*diff*/) {} + virtual void Update(uint32 /*diff*/) { } //Used by the map's CanEnter function. //This is to prevent players from entering during boss encounters. virtual bool IsEncounterInProgress() const; //Called when a player successfully enters the instance. - virtual void OnPlayerEnter(Player* /*player*/) {} + virtual void OnPlayerEnter(Player* /*player*/) { } //Handle open / close objects //use HandleGameObject(0, boolen, GO); in OnObjectCreate in instance scripts @@ -212,7 +212,7 @@ class InstanceScript : public ZoneScript void SendEncounterUnit(uint32 type, Unit* unit = NULL, uint8 param1 = 0, uint8 param2 = 0); - virtual void FillInitialWorldStates(WorldPacket& /*data*/) {} + virtual void FillInitialWorldStates(WorldPacket& /*data*/) { } protected: void SetBossNumber(uint32 number) { bosses.resize(number); } |