diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-14 21:01:55 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-14 21:01:55 +0200 |
| commit | 13ff07f1213b7214797363171bfd95fd1b8515e2 (patch) | |
| tree | 74b70f4e95c94a4b5ad5316c57c6f17d0a42d0ce /src/server/game/Instances/InstanceScript.h | |
| parent | c88c1c6848eb8ee08756e9dafbb3e01ee7ec2ed1 (diff) | |
| parent | 14bbe3e2e97fef01ada597557e804c1868a8c77c (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Battlegrounds/ArenaScore.h
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Battlegrounds/Battleground.h
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Pet/Pet.cpp
src/server/scripts/Commands/cs_wp.cpp
Diffstat (limited to 'src/server/game/Instances/InstanceScript.h')
| -rw-r--r-- | src/server/game/Instances/InstanceScript.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h index ce9b2448dd4..7e9be651e61 100644 --- a/src/server/game/Instances/InstanceScript.h +++ b/src/server/game/Instances/InstanceScript.h @@ -35,8 +35,8 @@ class Player; class GameObject; class Creature; -typedef std::set<GameObject*> DoorSet; -typedef std::set<Creature*> MinionSet; +typedef std::set<uint64> DoorSet; +typedef std::set<uint64> MinionSet; enum EncounterFrameType { |