aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortobmaps <spambot42@yandex.ru>2011-07-29 07:55:00 +0700
committertobmaps <spambot42@yandex.ru>2011-07-29 07:55:00 +0700
commitcf643e51504e9cf1e6406b0781861e78f70374e0 (patch)
tree27e14656195ef9470c930f4e8f44522fde82e9c2 /src
parent0c6079790b847f272781072edbf79ab6ab507c57 (diff)
Core/Arenas: Removed some outdated stuff
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/game/Battlegrounds/Zones/BattlegroundRV.cpp12
-rwxr-xr-xsrc/server/game/Battlegrounds/Zones/BattlegroundRV.h4
2 files changed, 5 insertions, 11 deletions
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp
index c8761303a52..dc06e5453f9 100755
--- a/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp
@@ -81,6 +81,7 @@ void BattlegroundRV::Update(uint32 diff)
setState(BG_RV_STATE_OPEN_FIRE);
break;
case BG_RV_STATE_OPEN_FIRE:
+ // FIXME: after 3.2.0 it's only decorative and should be opened only one time at battle start
for (i = BG_RV_OBJECT_FIRE_1; i <= BG_RV_OBJECT_FIREDOOR_2; ++i)
DoorOpen(i);
setTimer(BG_RV_FIRE_TO_PILAR_TIMER);
@@ -108,9 +109,6 @@ void BattlegroundRV::StartingEventOpenDoors()
// Buff respawn
SpawnBGObject(BG_RV_OBJECT_BUFF_1, 90);
SpawnBGObject(BG_RV_OBJECT_BUFF_2, 90);
- // Open fences
- DoorOpen(BG_RV_OBJECT_FENCE_1);
- DoorOpen(BG_RV_OBJECT_FENCE_2);
// Elevators
DoorOpen(BG_RV_OBJECT_ELEVATOR_1);
DoorOpen(BG_RV_OBJECT_ELEVATOR_2);
@@ -176,6 +174,9 @@ void BattlegroundRV::HandleAreaTrigger(Player *Source, uint32 Trigger)
{
case 5224:
case 5226:
+ // fire was removed in 3.2.0
+ case 5473:
+ case 5474:
break;
default:
sLog->outError("WARNING: Unhandled AreaTrigger in Battleground: %u", Trigger);
@@ -199,11 +200,8 @@ void BattlegroundRV::Reset()
bool BattlegroundRV::SetupBattleground()
{
- // Fence
- if (!AddObject(BG_RV_OBJECT_FENCE_1, BG_RV_OBJECT_TYPE_FENCE_1, 763.432373f, -274.058197f, 28.276695f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
- || !AddObject(BG_RV_OBJECT_FENCE_2, BG_RV_OBJECT_TYPE_FENCE_2, 763.432373f, -294.419464f, 28.276684f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
// elevators
- || !AddObject(BG_RV_OBJECT_ELEVATOR_1, BG_RV_OBJECT_TYPE_ELEVATOR_1, 763.536377f, -294.535767f, 0.505383f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
+ if (!AddObject(BG_RV_OBJECT_ELEVATOR_1, BG_RV_OBJECT_TYPE_ELEVATOR_1, 763.536377f, -294.535767f, 0.505383f, 3.141593f, 0, 0, 0, RESPAWN_IMMEDIATELY)
|| !AddObject(BG_RV_OBJECT_ELEVATOR_2, BG_RV_OBJECT_TYPE_ELEVATOR_2, 763.506348f, -273.873352f, 0.505383f, 0.000000f, 0, 0, 0, RESPAWN_IMMEDIATELY)
// buffs
|| !AddObject(BG_RV_OBJECT_BUFF_1, BG_RV_OBJECT_TYPE_BUFF_1, 735.551819f, -284.794678f, 28.276682f, 0.034906f, 0, 0, 0, RESPAWN_IMMEDIATELY)
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRV.h b/src/server/game/Battlegrounds/Zones/BattlegroundRV.h
index 9722eb057c7..cea0390f665 100755
--- a/src/server/game/Battlegrounds/Zones/BattlegroundRV.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundRV.h
@@ -46,8 +46,6 @@ enum BattlegroundRVObjectTypes
*/
BG_RV_OBJECT_ELEVATOR_1,
BG_RV_OBJECT_ELEVATOR_2,
- BG_RV_OBJECT_FENCE_1,
- BG_RV_OBJECT_FENCE_2,
BG_RV_OBJECT_MAX,
};
@@ -62,8 +60,6 @@ enum BattlegroundRVObjects
BG_RV_OBJECT_TYPE_FIREDOOR_1 = 192388,
BG_RV_OBJECT_TYPE_PULLEY_1 = 192389,
BG_RV_OBJECT_TYPE_PULLEY_2 = 192390,
- BG_RV_OBJECT_TYPE_FENCE_1 = 192391,
- BG_RV_OBJECT_TYPE_FENCE_2 = 192392,
BG_RV_OBJECT_TYPE_GEAR_1 = 192393,
BG_RV_OBJECT_TYPE_GEAR_2 = 192394,
BG_RV_OBJECT_TYPE_ELEVATOR_1 = 194582,