diff options
| author | megamage <none@none> | 2009-03-16 15:51:45 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-03-16 15:51:45 -0600 |
| commit | 986334e64140bbd56efcb57ec90259330dc6e1c7 (patch) | |
| tree | ce7062f83d9eb11374b790b68ebff0784955cd26 /src/game | |
| parent | 8a1d6df8c08d8fd1757fdcb7277988eaf690ffa8 (diff) | |
[7472] Fixed messages in Eye of Storm Battleground. Author: Triply
--HG--
branch : trunk
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/BattleGroundEY.cpp | 8 | ||||
| -rw-r--r-- | src/game/Language.h | 6 | ||||
| -rw-r--r-- | src/game/Player.cpp | 1 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/game/BattleGroundEY.cpp b/src/game/BattleGroundEY.cpp index a9402fd6c67..f50f2d332e1 100644 --- a/src/game/BattleGroundEY.cpp +++ b/src/game/BattleGroundEY.cpp @@ -614,9 +614,9 @@ void BattleGroundEY::EventPlayerDroppedFlag(Player *Source) UpdateWorldState(NETHERSTORM_FLAG_STATE_ALLIANCE, BG_EY_FLAG_STATE_WAIT_RESPAWN); if(Source->GetTeam() == ALLIANCE) - SendMessageToAll(LANG_BG_EY_DROPPED_FLAG,CHAT_MSG_BG_SYSTEM_ALLIANCE, Source); + SendMessageToAll(LANG_BG_EY_DROPPED_FLAG, CHAT_MSG_BG_SYSTEM_ALLIANCE, NULL); else - SendMessageToAll(LANG_BG_EY_DROPPED_FLAG,CHAT_MSG_BG_SYSTEM_HORDE, Source); + SendMessageToAll(LANG_BG_EY_DROPPED_FLAG, CHAT_MSG_BG_SYSTEM_HORDE, NULL); } void BattleGroundEY::EventPlayerClickedOnFlag(Player *Source, GameObject* target_obj) @@ -646,9 +646,9 @@ void BattleGroundEY::EventPlayerClickedOnFlag(Player *Source, GameObject* target Source->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT); if(Source->GetTeam() == ALLIANCE) - SendMessageToAll(LANG_BG_EY_HAS_TAKEN_FLAG,CHAT_MSG_BG_SYSTEM_ALLIANCE, Source); + PSendMessageToAll(LANG_BG_EY_HAS_TAKEN_FLAG, CHAT_MSG_BG_SYSTEM_ALLIANCE, NULL, Source->GetName()); else - SendMessageToAll(LANG_BG_EY_HAS_TAKEN_FLAG,CHAT_MSG_BG_SYSTEM_HORDE, Source); + PSendMessageToAll(LANG_BG_EY_HAS_TAKEN_FLAG, CHAT_MSG_BG_SYSTEM_HORDE, NULL, Source->GetName()); } void BattleGroundEY::EventTeamLostPoint(Player *Source, uint32 Point) diff --git a/src/game/Language.h b/src/game/Language.h index c2694a9909a..035fef4cfe3 100644 --- a/src/game/Language.h +++ b/src/game/Language.h @@ -688,9 +688,9 @@ enum TrinityStrings LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING = 750, // "Not enough players. This game will close in %u mins." LANG_BATTLEGROUND_PREMATURE_FINISH_WARNING_SECS = 751, // "Not enough players. This game will close in %u seconds." // = 752, not used -// LANG_BG_WS_START_TWO_MINUTES = 753, -// LANG_BG_AB_START_TWO_MINUTES = 754, -// LANG_BG_EY_START_TWO_MINUTES = 755, +// LANG_BG_WS_START_TWO_MINUTES = 753, - defined above +// LANG_BG_AB_START_TWO_MINUTES = 754, - defined above +// LANG_BG_EY_START_TWO_MINUTES = 755, - defined above // Room for batleground/arena strings 756-799 not used // Room for BG/ARENA 750-769 not used diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 8ecd58fa362..e69848b55b8 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -20228,6 +20228,7 @@ bool Player::CanUseBattleGroundObject() { return ( //InBattleGround() && // in battleground - not need, check in other cases //!IsMounted() && - not correct, player is dismounted when he clicks on flag + //i'm not sure if these two are correct, because invisible players should get visible when they click on flag !HasStealthAura() && // not stealthed !HasInvisibilityAura() && // not invisible !HasAura(SPELL_RECENTLY_DROPPED_FLAG, 0) && // can't pickup |