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

Game/Battlefield:

Browse Source 
- Remove double definition of one NPC
- Use definition instead a "magic number"
This commit is contained in:
AliveShiro
2013-10-25 17:30:24 +02:00
parent 5e62edd7c9
commit cc89ac0be3
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Battlefield/Zones/BattlefieldWG.cpp
View File

@@ -166,7 +166,7 @@ bool BattlefieldWG::SetupBattlefield()
{
Position towerCannonPos;
WGTurret[i].GetPosition(&towerCannonPos);
if (Creature* creature = SpawnCreature(NPC_TOWER_CANNON, towerCannonPos, TEAM_ALLIANCE))
if (Creature* creature = SpawnCreature(NPC_WINTERGRASP_TOWER_CANNON, towerCannonPos, TEAM_ALLIANCE))
{
CanonList.insert(creature->GetGUID());
HideNpc(creature);

3
src/server/game/Battlefield/Zones/BattlefieldWG.h
View File

@@ -208,7 +208,6 @@ enum WintergraspNpcs
NPC_TAUNKA_SPIRIT_GUIDE = 31841, // Horde spirit guide for Wintergrasp
NPC_DWARVEN_SPIRIT_GUIDE = 31842, // Alliance spirit guide for Wintergrasp
NPC_TOWER_CANNON = 28366,
NPC_WINTERGRASP_SIEGE_ENGINE_ALLIANCE = 28312,
NPC_WINTERGRASP_SIEGE_ENGINE_HORDE = 32627,
@@ -1338,7 +1337,7 @@ struct BfWGGameObjectBuilding
{
Position towerCannonPos;
TowerCannon[towerid].TurretTop[i].GetPosition(&towerCannonPos);
if (Creature* turret = m_WG->SpawnCreature(28366, towerCannonPos, TeamId(0)))
if (Creature* turret = m_WG->SpawnCreature(NPC_WINTERGRASP_TOWER_CANNON, towerCannonPos, TeamId(0)))
{
m_TurretTopList.insert(turret->GetGUID());
switch (go->GetEntry())