aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities
diff options
context:
space:
mode:
authorunknown <illusion@.(none)>2011-09-29 22:35:00 +0400
committerunknown <illusion@.(none)>2011-09-29 22:35:00 +0400
commit8acf07dbabca3ba5ea3c0de8b2b742f72c35c812 (patch)
tree062eec6a7c835a0ddb8012ad68ee25c1185c2f23 /src/server/game/Entities
parent18aad847e1d47295c0967bf6a85e9a89283ef958 (diff)
Random minor code cleanup
Diffstat (limited to 'src/server/game/Entities')
-rwxr-xr-xsrc/server/game/Entities/GameObject/GameObject.cpp5
-rwxr-xr-xsrc/server/game/Entities/Player/Player.cpp6
2 files changed, 1 insertions, 10 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 4ec77e38bcf..3c0cef14430 100755
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -1540,11 +1540,8 @@ void GameObject::Use(Unit* user)
switch (info->entry)
{
case 179785: // Silverwing Flag
- // check if it's correct bg
- if (bg->IsRandom() ? bg->GetTypeID(true) : bg->GetTypeID(false) == BATTLEGROUND_WS)
- bg->EventPlayerClickedOnFlag(player, this);
- break;
case 179786: // Warsong Flag
+ // check if it's correct bg
if (bg->IsRandom() ? bg->GetTypeID(true) : bg->GetTypeID(false) == BATTLEGROUND_WS)
bg->EventPlayerClickedOnFlag(player, this);
break;
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 579a704bd83..391efdbf85f 100755
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -9057,11 +9057,7 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
case 3698:
case 3702:
case 3968:
- NumberOfFields = 11;
- break;
case 4378:
- NumberOfFields = 11;
- break;
case 3703:
NumberOfFields = 11;
break;
@@ -9072,8 +9068,6 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
NumberOfFields = 28;
break;
case 4812: // Icecrown Citadel
- NumberOfFields = 13;
- break;
case 4100: // The Culling of Stratholme
NumberOfFields = 13;
break;