Skip to content

Commit

Permalink
Add prefix to the defined values in prev commits
Browse files Browse the repository at this point in the history
  • Loading branch information
@xfurry
xfurry committed Sep 10, 2016
1 parent 2d9d12b commit 7103de1
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 48 deletions.
12 changes: 6 additions & 6 deletions src/game/BattleGround/BattleGroundDS.cpp
View file
Expand Up @@ -50,7 +50,7 @@ void BattleGroundDS::Update(uint32 diff)
for (GuidList::const_iterator itr = m_lGateTriggersGuids.begin(); itr != m_lGateTriggersGuids.end(); ++itr)
{
if (Creature* trigger = GetBgMap()->GetCreature(*itr))
trigger->CastSpell(trigger, SPELL_FLUSH, true);
trigger->CastSpell(trigger, BG_DS_SPELL_FLUSH, true);
}

// knockback players manually due to missing triggered spell 61698
Expand Down Expand Up @@ -118,7 +118,7 @@ void BattleGroundDS::Update(uint32 diff)
if (m_uiWaterfallSpellTimer <= diff)
{
if (Creature* trigger = GetBgMap()->GetCreature(m_waterfallTriggerGuid))
trigger->CastSpell(trigger, SPELL_WATER_SPOUT, true);
trigger->CastSpell(trigger, BG_DS_SPELL_WATER_SPOUT, true);

m_uiWaterfallSpellTimer = 1500;
}
Expand Down Expand Up @@ -196,7 +196,7 @@ bool BattleGroundDS::HandleAreaTrigger(Player* player, uint32 triggerId)
case 5347:
case 5348:
// safety check
player->RemoveAurasDueToSpell(SPELL_DEMONIC_CIRCLE);
player->RemoveAurasDueToSpell(BG_DS_SPELL_DEMONIC_CIRCLE);
break;
default:
return false;
Expand All @@ -206,7 +206,7 @@ bool BattleGroundDS::HandleAreaTrigger(Player* player, uint32 triggerId)

void BattleGroundDS::HandleCreatureCreate(Creature* creature)
{
if (creature->GetEntry() == CREATURE_WATER_SPOUT)
if (creature->GetEntry() == BG_DS_CREATURE_WATER_SPOUT)
{
if (creature->GetPositionZ() < 10.0f)
m_waterfallTriggerGuid = creature->GetObjectGuid();
Expand All @@ -219,10 +219,10 @@ void BattleGroundDS::HandleGameObjectCreate(GameObject* go)
{
switch (go->GetEntry())
{
case GO_WATERFALL_COLLISION:
case BG_DS_GO_WATERFALL_COLLISION:
m_waterfallCollisionGuid = go->GetObjectGuid();
break;
case GO_WATERFALL_ANIM:
case BG_DS_GO_WATERFALL_ANIM:
m_waterfallAnimGuid = go->GetObjectGuid();
break;
}
Expand Down
20 changes: 10 additions & 10 deletions src/game/BattleGround/BattleGroundDS.h
View file
Expand Up @@ -20,19 +20,19 @@

enum
{
CREATURE_WATER_SPOUT = 28567,
BG_DS_CREATURE_WATER_SPOUT = 28567,

// GO_DALARA_SEWERS_DOOR_1 = 192642,
// GO_DALARA_SEWERS_DOOR_2 = 192643,
GO_WATERFALL_COLLISION = 194395,
GO_WATERFALL_ANIM = 191877,
// GO_SHADOW_SIGHT_1 = 184663,
// GO_SHADOW_SIGHT_2 = 184664,
// BG_DS_GO_DALARA_SEWERS_DOOR_1 = 192642,
// BG_DS_GO_DALARA_SEWERS_DOOR_2 = 192643,
BG_DS_GO_WATERFALL_COLLISION = 194395,
BG_DS_GO_WATERFALL_ANIM = 191877,
// BG_DS_GO_SHADOW_SIGHT_1 = 184663,
// BG_DS_GO_SHADOW_SIGHT_2 = 184664,

SPELL_FLUSH = 57405, // Triggers 61698; Visual and target selector for the starting knockback from the pipe
SPELL_WATER_SPOUT = 58873, // Knockback effect of the central waterfall
BG_DS_SPELL_FLUSH = 57405, // Triggers 61698; Visual and target selector for the starting knockback from the pipe
BG_DS_SPELL_WATER_SPOUT = 58873, // Knockback effect of the central waterfall

SPELL_DEMONIC_CIRCLE = 48018 // Demonic Circle Summon
BG_DS_SPELL_DEMONIC_CIRCLE = 48018 // Demonic Circle Summon
};

class BattleGround;
Expand Down
24 changes: 12 additions & 12 deletions src/game/BattleGround/BattleGroundRV.cpp
View file
Expand Up @@ -130,22 +130,22 @@ void BattleGroundRV::HandleGameObjectCreate(GameObject* go)
{
switch (go->GetEntry())
{
case GO_ORG_ARENA_PILAR_1:
case GO_ORG_ARENA_PILAR_2:
case GO_ORG_ARENA_PILAR_3:
case GO_ORG_ARENA_PILAR_4:
case BG_RV_GO_ORG_ARENA_PILAR_1:
case BG_RV_GO_ORG_ARENA_PILAR_2:
case BG_RV_GO_ORG_ARENA_PILAR_3:
case BG_RV_GO_ORG_ARENA_PILAR_4:
m_lPillarsGuids.push_back(go->GetObjectGuid());
break;
case GO_ORG_ARENA_COLLISION_1:
case GO_ORG_ARENA_COLLISION_2:
case GO_ORG_ARENA_COLLISION_3:
case GO_ORG_ARENA_COLLISION_4:
case BG_RV_GO_ORG_ARENA_COLLISION_1:
case BG_RV_GO_ORG_ARENA_COLLISION_2:
case BG_RV_GO_ORG_ARENA_COLLISION_3:
case BG_RV_GO_ORG_ARENA_COLLISION_4:
m_lCollisionsGuids.push_back(go->GetObjectGuid());
break;
case GO_ORG_ARENA_GEAR_1:
case GO_ORG_ARENA_GEAR_2:
case GO_ORG_ARENA_PULLEY_1:
case GO_ORG_ARENA_PULLEY_2:
case BG_RV_GO_ORG_ARENA_GEAR_1:
case BG_RV_GO_ORG_ARENA_GEAR_2:
case BG_RV_GO_ORG_ARENA_PULLEY_1:
case BG_RV_GO_ORG_ARENA_PULLEY_2:
m_lAnimationsGuids.push_back(go->GetObjectGuid());
break;
}
Expand Down
40 changes: 20 additions & 20 deletions src/game/BattleGround/BattleGroundRV.h
View file
Expand Up @@ -20,33 +20,33 @@

enum
{
// GO_ARENA_ELEVATOR_1 = 194582,
// GO_ARENA_ELEVATOR_2 = 194586,
// GO_SHADOW_SIGHT_1 = 184663,
// GO_SHADOW_SIGHT_2 = 184664,
// BG_RV_GO_ARENA_ELEVATOR_1 = 194582,
// BG_RV_GO_ARENA_ELEVATOR_2 = 194586,
// BG_RV_GO_SHADOW_SIGHT_1 = 184663,
// BG_RV_GO_SHADOW_SIGHT_2 = 184664,

// GO_ORG_ARENA_FIRE_1 = 192704, // fires removed as of 3.2.0
// GO_ORG_ARENA_FIRE_2 = 192705,
// GO_ORG_ARENA_FIREDOOR_1 = 192387,
// GO_ORG_ARENA_FIREDOOR_2 = 192388,
// BG_RV_GO_ORG_ARENA_FIRE_1 = 192704, // fires removed as of 3.2.0
// BG_RV_GO_ORG_ARENA_FIRE_2 = 192705,
// BG_RV_GO_ORG_ARENA_FIREDOOR_1 = 192387,
// BG_RV_GO_ORG_ARENA_FIREDOOR_2 = 192388,

// animations
GO_ORG_ARENA_PULLEY_1 = 192389, // arena
GO_ORG_ARENA_PULLEY_2 = 192390, // ivory
GO_ORG_ARENA_GEAR_1 = 192393, // lightning
GO_ORG_ARENA_GEAR_2 = 192394, // axe
BG_RV_GO_ORG_ARENA_PULLEY_1 = 192389, // arena
BG_RV_GO_ORG_ARENA_PULLEY_2 = 192390, // ivory
BG_RV_GO_ORG_ARENA_GEAR_1 = 192393, // lightning
BG_RV_GO_ORG_ARENA_GEAR_2 = 192394, // axe

// collisions
GO_ORG_ARENA_COLLISION_1 = 194580, // axe
GO_ORG_ARENA_COLLISION_2 = 194579, // arena
GO_ORG_ARENA_COLLISION_3 = 194581, // lightning
GO_ORG_ARENA_COLLISION_4 = 194578, // ivory
BG_RV_GO_ORG_ARENA_COLLISION_1 = 194580, // axe
BG_RV_GO_ORG_ARENA_COLLISION_2 = 194579, // arena
BG_RV_GO_ORG_ARENA_COLLISION_3 = 194581, // lightning
BG_RV_GO_ORG_ARENA_COLLISION_4 = 194578, // ivory

// transports
GO_ORG_ARENA_PILAR_1 = 194583, // axe
GO_ORG_ARENA_PILAR_2 = 194584, // arena
GO_ORG_ARENA_PILAR_3 = 194585, // lightning
GO_ORG_ARENA_PILAR_4 = 194587 // ivory
BG_RV_GO_ORG_ARENA_PILAR_1 = 194583, // axe
BG_RV_GO_ORG_ARENA_PILAR_2 = 194584, // arena
BG_RV_GO_ORG_ARENA_PILAR_3 = 194585, // lightning
BG_RV_GO_ORG_ARENA_PILAR_4 = 194587 // ivory
};

class BattleGround;
Expand Down

0 comments on commit 7103de1

Please sign in to comment.