diff options
author | Machiavelli <none@none> | 2010-06-02 18:45:19 +0200 |
---|---|---|
committer | Machiavelli <none@none> | 2010-06-02 18:45:19 +0200 |
commit | b1bf3b5e13c02e8f895381b6d79c15a46f6c9bc2 (patch) | |
tree | 86a303002c2f269768cbe94a867e274983aa913d /src | |
parent | fb8399c4132b97f5637efb8dd7262050964f568a (diff) | |
parent | d9728b2b807e702142bba5c72194d04eec723886 (diff) |
Merge
--HG--
branch : trunk
Diffstat (limited to 'src')
-rw-r--r-- | src/game/BattleGroundSA.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/BattleGroundSA.cpp b/src/game/BattleGroundSA.cpp index 95137710adf..48595dcfa98 100644 --- a/src/game/BattleGroundSA.cpp +++ b/src/game/BattleGroundSA.cpp @@ -241,7 +241,6 @@ void BattleGroundSA::Update(uint32 diff) SignaledRoundTwo = true; InitSecondRound = false; SendMessageToAll(LANG_BG_SA_ROUND_TWO_ONE_MINUTE, CHAT_MSG_BG_SYSTEM_NEUTRAL); - ResetObjs(); } }else { @@ -748,6 +747,7 @@ void BattleGroundSA::EventPlayerUsedGO(Player* Source, GameObject* object) SignaledRoundTwo = false; SignaledRoundTwoHalfMin = false; InitSecondRound = true; + ResetObjs(); } else if (status == BG_SA_ROUND_TWO) { |