From 2fa4cf41a7943514cb925c32729ba5b4adee22d9 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Wed, 1 Dec 2010 02:26:24 +0300 Subject: [PATCH] [10798] Some more warning fixes related to BattleGroundTeamIndex/BattleGroundAVTeamIndex. --- src/game/BattleGroundAV.cpp | 18 +++++++++--------- src/shared/revision_nr.h | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/game/BattleGroundAV.cpp b/src/game/BattleGroundAV.cpp index 7c2a2a276..43644366e 100644 --- a/src/game/BattleGroundAV.cpp +++ b/src/game/BattleGroundAV.cpp @@ -477,9 +477,9 @@ void BattleGroundAV::ChangeMineOwner(uint8 mine, BattleGroundAVTeamIndex teamIdx bool BattleGroundAV::PlayerCanDoMineQuest(int32 GOId, Team team) { if (GOId == BG_AV_OBJECTID_MINE_N) - return (m_Mine_Owner[BG_AV_NORTH_MINE] == GetTeamIndexByTeamId(team)); + return (m_Mine_Owner[BG_AV_NORTH_MINE] == GetAVTeamIndexByTeamId(team)); if (GOId == BG_AV_OBJECTID_MINE_S) - return (m_Mine_Owner[BG_AV_SOUTH_MINE] == GetTeamIndexByTeamId(team)); + return (m_Mine_Owner[BG_AV_SOUTH_MINE] == GetAVTeamIndexByTeamId(team)); return true; // cause it's no mine'object it is ok if this is true } @@ -537,7 +537,7 @@ void BattleGroundAV::EventPlayerDefendsPoint(Player* player, BG_AV_Nodes node) BattleGroundTeamIndex teamIdx = GetTeamIndexByTeamId(player->GetTeam()); - if (m_Nodes[node].Owner == teamIdx || m_Nodes[node].State != POINT_ASSAULTED) + if (m_Nodes[node].Owner == BattleGroundAVTeamIndex(teamIdx) || m_Nodes[node].State != POINT_ASSAULTED) return; if( m_Nodes[node].TotalOwner == BG_AV_TEAM_NEUTRAL ) // initial snowfall capture { @@ -549,7 +549,7 @@ void BattleGroundAV::EventPlayerDefendsPoint(Player* player, BG_AV_Nodes node) } DEBUG_LOG("BattleGroundAV: player defends node: %i", node); - if (m_Nodes[node].PrevOwner != teamIdx) + if (m_Nodes[node].PrevOwner != BattleGroundAVTeamIndex(teamIdx)) { sLog.outError("BattleGroundAV: player defends point which doesn't belong to his team %i", node); return; @@ -583,7 +583,7 @@ void BattleGroundAV::EventPlayerAssaultsPoint(Player* player, BG_AV_Nodes node) // TODO implement quest 7101, 7081 BattleGroundTeamIndex teamIdx = GetTeamIndexByTeamId(player->GetTeam()); DEBUG_LOG("BattleGroundAV: player assaults node %i", node); - if (m_Nodes[node].Owner == teamIdx || teamIdx == m_Nodes[node].TotalOwner) + if (m_Nodes[node].Owner == BattleGroundAVTeamIndex(teamIdx) || BattleGroundAVTeamIndex(teamIdx) == m_Nodes[node].TotalOwner) return; AssaultNode(node, teamIdx); // update nodeinfo variables @@ -724,8 +724,8 @@ uint32 BattleGroundAV::GetNodeName(BG_AV_Nodes node) void BattleGroundAV::AssaultNode(BG_AV_Nodes node, BattleGroundTeamIndex teamIdx) { - MANGOS_ASSERT(m_Nodes[node].TotalOwner != teamIdx); - MANGOS_ASSERT(m_Nodes[node].Owner != teamIdx); + MANGOS_ASSERT(m_Nodes[node].TotalOwner != BattleGroundAVTeamIndex(teamIdx)); + MANGOS_ASSERT(m_Nodes[node].Owner != BattleGroundAVTeamIndex(teamIdx)); // only assault an assaulted node if no totalowner exists: MANGOS_ASSERT(m_Nodes[node].State != POINT_ASSAULTED || m_Nodes[node].TotalOwner == BG_AV_TEAM_NEUTRAL); // the timer gets another time, if the previous owner was 0 == Neutral @@ -764,8 +764,8 @@ void BattleGroundAV::InitNode(BG_AV_Nodes node, BattleGroundAVTeamIndex teamIdx, void BattleGroundAV::DefendNode(BG_AV_Nodes node, BattleGroundTeamIndex teamIdx) { - MANGOS_ASSERT(m_Nodes[node].TotalOwner == teamIdx); - MANGOS_ASSERT(m_Nodes[node].Owner != teamIdx); + MANGOS_ASSERT(m_Nodes[node].TotalOwner == BattleGroundAVTeamIndex(teamIdx)); + MANGOS_ASSERT(m_Nodes[node].Owner != BattleGroundAVTeamIndex(teamIdx)); MANGOS_ASSERT(m_Nodes[node].State != POINT_CONTROLLED); m_Nodes[node].PrevOwner = m_Nodes[node].Owner; m_Nodes[node].Owner = BattleGroundAVTeamIndex(teamIdx); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index a88863c9f..e96627d88 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10797" + #define REVISION_NR "10798" #endif // __REVISION_NR_H__