josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Battleground: Combine bg score type enum values with the same name

Browse Source 
Signed-off-by: Shauren <[email protected]>
This commit is contained in:
Shauren
2011-01-14 23:02:15 +01:00
parent 064755e8a1
commit 9584f58130
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Battlegrounds/Battleground.h
+1 -4
View File
@@ -195,7 +195,7 @@ enum ScoreType
//WS //WS
SCORE_FLAG_CAPTURES = 7, SCORE_FLAG_CAPTURES = 7,
SCORE_FLAG_RETURNS = 8, SCORE_FLAG_RETURNS = 8,
//AB //AB and IC
SCORE_BASES_ASSAULTED = 9, SCORE_BASES_ASSAULTED = 9,
SCORE_BASES_DEFENDED = 10, SCORE_BASES_DEFENDED = 10,
//AV //AV
@@ -209,9 +209,6 @@ enum ScoreType
//SOTA //SOTA
SCORE_DESTROYED_DEMOLISHER = 18, SCORE_DESTROYED_DEMOLISHER = 18,
SCORE_DESTROYED_WALL = 19, SCORE_DESTROYED_WALL = 19,
//IC
SCORE_BASE_ASSAULTED = 20,
SCORE_BASE_DEFENDED = 21
}; };
enum ArenaType enum ArenaType
src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp
+4 -4
View File
@@ -332,10 +332,10 @@ void BattlegroundIC::UpdatePlayerScore(Player* Source, uint32 type, uint32 value
switch(type) switch(type)
{ {
case SCORE_BASE_ASSAULTED: case SCORE_BASES_ASSAULTED:
((BattlegroundICScore*)itr->second)->BasesAssaulted += value; ((BattlegroundICScore*)itr->second)->BasesAssaulted += value;
break; break;
case SCORE_BASE_DEFENDED: case SCORE_BASES_DEFENDED:
((BattlegroundICScore*)itr->second)->BasesDefended += value; ((BattlegroundICScore*)itr->second)->BasesDefended += value;
break; break;
default: default:
@@ -529,7 +529,7 @@ void BattlegroundIC::EventPlayerClickedOnFlag(Player* player, GameObject* target
if (m_BgCreatures[BG_IC_NPC_SPIRIT_GUIDE_1+(nodePoint[i].nodeType)-2]) if (m_BgCreatures[BG_IC_NPC_SPIRIT_GUIDE_1+(nodePoint[i].nodeType)-2])
DelCreature(BG_IC_NPC_SPIRIT_GUIDE_1+(nodePoint[i].nodeType)-2); DelCreature(BG_IC_NPC_SPIRIT_GUIDE_1+(nodePoint[i].nodeType)-2);
UpdatePlayerScore(player, SCORE_BASE_ASSAULTED, 1); UpdatePlayerScore(player, SCORE_BASES_ASSAULTED, 1);
SendMessage2ToAll(LANG_BG_IC_TEAM_ASSAULTED_NODE_1,CHAT_MSG_BG_SYSTEM_NEUTRAL,player,nodePoint[i].string); SendMessage2ToAll(LANG_BG_IC_TEAM_ASSAULTED_NODE_1,CHAT_MSG_BG_SYSTEM_NEUTRAL,player,nodePoint[i].string);
SendMessage2ToAll(LANG_BG_IC_TEAM_ASSAULTED_NODE_2,CHAT_MSG_BG_SYSTEM_NEUTRAL,player,nodePoint[i].string, (player->GetTeamId() == TEAM_ALLIANCE ? LANG_BG_IC_ALLIANCE : LANG_BG_IC_HORDE)); SendMessage2ToAll(LANG_BG_IC_TEAM_ASSAULTED_NODE_2,CHAT_MSG_BG_SYSTEM_NEUTRAL,player,nodePoint[i].string, (player->GetTeamId() == TEAM_ALLIANCE ? LANG_BG_IC_ALLIANCE : LANG_BG_IC_HORDE));
@@ -542,7 +542,7 @@ void BattlegroundIC::EventPlayerClickedOnFlag(Player* player, GameObject* target
nodePoint[i].needChange = false; nodePoint[i].needChange = false;
SendMessage2ToAll(LANG_BG_IC_TEAM_DEFENDED_NODE,CHAT_MSG_BG_SYSTEM_NEUTRAL,player,nodePoint[i].string); SendMessage2ToAll(LANG_BG_IC_TEAM_DEFENDED_NODE,CHAT_MSG_BG_SYSTEM_NEUTRAL,player,nodePoint[i].string);
HandleCapturedNodes(&nodePoint[i],true); HandleCapturedNodes(&nodePoint[i],true);
UpdatePlayerScore(player, SCORE_BASE_DEFENDED, 1); UpdatePlayerScore(player, SCORE_BASES_DEFENDED, 1);
} }
GameObject* banner = GetBGObject(nodePoint[i].gameobject_type); GameObject* banner = GetBGObject(nodePoint[i].gameobject_type);