Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-26 20:02:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source
This commit is contained in:
Vincent-Michael
2014-04-26 14:51:00 +02:00
parent 3ef7a7299f 113e6b0162
commit de281846cc
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/updates/world/2014_04_26_04_world_creature_template.sql Normal file
View File

@@ -0,0 +1,3 @@
--
UPDATE `creature_template` SET `faction_A`=1770, `faction_H`=1770 WHERE `entry`=37614;
UPDATE `creature_template` SET `faction_A`=534, `faction_H`=534 WHERE `entry`=37606;

4
src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
View File

@@ -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;

1
src/server/game/Battlegrounds/Zones/BattlegroundSA.h
View File

@@ -20,6 +20,7 @@
#define __BATTLEGROUNDSA_H
#include "Battleground.h"
#include "Object.h"
struct BattlegroundSAScore : public BattlegroundScore
{