diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-26 14:51:00 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-26 14:51:00 +0200 |
| commit | de281846ccd7ccae739a219805efa5917ce48bfc (patch) | |
| tree | ef8e27fffe7535924704c56db87bb2731b8eaac6 /src | |
| parent | 3ef7a7299f022e0062caabf2e808b36e30f84ae0 (diff) | |
| parent | 113e6b0162f88679c12981756b1dd87b79993e4f (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Battlegrounds/Zones/BattlegroundSA.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp index f5b51a7fc14..470bc549be5 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp @@ -569,7 +569,7 @@ void BattlegroundSA::ProcessEvent(WorldObject* obj, uint32 eventId, WorldObject* if (Creature* c = obj->FindNearestCreature(NPC_WORLD_TRIGGER, 500.0f)) SendChatMessage(c, gate->DamagedText, invoker); - PlaySoundToAll(Attackers == ALLIANCE ? SOUND_WALL_ATTACKED_ALLIANCE : SOUND_WALL_ATTACKED_HORDE); + PlaySoundToAll(Attackers == TEAM_ALLIANCE ? SOUND_WALL_ATTACKED_ALLIANCE : SOUND_WALL_ATTACKED_HORDE); } // destroyed else if (eventId == go->GetGOInfo()->building.destroyedEvent) @@ -617,7 +617,7 @@ void BattlegroundSA::ProcessEvent(WorldObject* obj, uint32 eventId, WorldObject* if (Creature* c = obj->FindNearestCreature(NPC_WORLD_TRIGGER, 500.0f)) SendChatMessage(c, gate->DestroyedText, invoker); - PlaySoundToAll(Attackers == ALLIANCE ? SOUND_WALL_DESTROYED_ALLIANCE : SOUND_WALL_DESTROYED_HORDE); + PlaySoundToAll(Attackers == TEAM_ALLIANCE ? SOUND_WALL_DESTROYED_ALLIANCE : SOUND_WALL_DESTROYED_HORDE); } else break; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h index 2a5c8fc15e4..8e3c933f893 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h @@ -20,6 +20,7 @@ #define __BATTLEGROUNDSA_H #include "Battleground.h" +#include "Object.h" struct BattlegroundSAScore : public BattlegroundScore { |