mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-16 22:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11586] Small cleanup and add missing arenas to IsArenaType

Browse source
This commit is contained in:
zergtmn 2011-06-01 18:30:25 +06:00
parent 4c81559800
commit 96cad8d771
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/game/BattleGroundMgr.cpp
View file

@ -1484,9 +1484,8 @@ BattleGround * BattleGroundMgr::CreateNewBattleGround(BattleGroundTypeId bgTypeI
//for arenas there is random map used //for arenas there is random map used
if (bg_template->isArena()) if (bg_template->isArena())
{ {
BattleGroundTypeId arenas[] = {BATTLEGROUND_NA, BATTLEGROUND_BE, BATTLEGROUND_RL}; BattleGroundTypeId arenas[] = { BATTLEGROUND_NA, BATTLEGROUND_BE, BATTLEGROUND_RL/*, BATTLEGROUND_DS, BATTLEGROUND_RV*/ };
uint32 arena_num = urand(0,2); bgTypeId = arenas[urand(0, countof(arenas)-1)];
bgTypeId = arenas[arena_num];
bg_template = GetBattleGroundTemplate(bgTypeId); bg_template = GetBattleGroundTemplate(bgTypeId);
if (!bg_template) if (!bg_template)
{ {
@ -1867,10 +1866,18 @@ void BattleGroundMgr::SendToBattleGround(Player *pl, uint32 instanceId, BattleGr
bool BattleGroundMgr::IsArenaType(BattleGroundTypeId bgTypeId) bool BattleGroundMgr::IsArenaType(BattleGroundTypeId bgTypeId)
{ {
return ( bgTypeId == BATTLEGROUND_AA || switch(bgTypeId)
bgTypeId == BATTLEGROUND_BE || {
bgTypeId == BATTLEGROUND_NA || case BATTLEGROUND_NA:
bgTypeId == BATTLEGROUND_RL ); case BATTLEGROUND_BE:
case BATTLEGROUND_RL:
case BATTLEGROUND_DS:
case BATTLEGROUND_RV:
case BATTLEGROUND_AA:
return true;
default:
return false;
};
} }
BattleGroundQueueTypeId BattleGroundMgr::BGQueueTypeId(BattleGroundTypeId bgTypeId, ArenaType arenaType) BattleGroundQueueTypeId BattleGroundMgr::BGQueueTypeId(BattleGroundTypeId bgTypeId, ArenaType arenaType)

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11585" #define REVISION_NR "11586"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__