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

Fixed realm flags enum.

Browse source
This commit is contained in:
tomrus88 2010-04-04 02:29:32 +04:00
parent 4535f78573
commit 55e7fb1b08
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/game/BattleGroundMgr.cpp
View file

@ -1353,7 +1353,7 @@ void BattleGroundMgr::BuildPvpLogDataPacket(WorldPacket *data, BattleGround *bg)
case BATTLEGROUND_DS: // wotlk case BATTLEGROUND_DS: // wotlk
case BATTLEGROUND_RV: // wotlk case BATTLEGROUND_RV: // wotlk
case BATTLEGROUND_IC: // wotlk case BATTLEGROUND_IC: // wotlk
case BATTLEGROUND_ABG: // wotlk case BATTLEGROUND_RB: // wotlk
*data << (int32)0; // 0 *data << (int32)0; // 0
break; break;
default: default:
@ -1527,7 +1527,7 @@ BattleGround * BattleGroundMgr::CreateNewBattleGround(BattleGroundTypeId bgTypeI
case BATTLEGROUND_IC: case BATTLEGROUND_IC:
bg = new BattleGroundIC(*(BattleGroundIC*)bg_template); bg = new BattleGroundIC(*(BattleGroundIC*)bg_template);
break; break;
case BATTLEGROUND_ABG: case BATTLEGROUND_RB:
bg = new BattleGroundABG(*(BattleGroundABG*)bg_template); bg = new BattleGroundABG(*(BattleGroundABG*)bg_template);
break; break;
default: default:
@ -1571,7 +1571,7 @@ uint32 BattleGroundMgr::CreateBattleGround(BattleGroundTypeId bgTypeId, bool IsA
case BATTLEGROUND_DS: bg = new BattleGroundDS; break; case BATTLEGROUND_DS: bg = new BattleGroundDS; break;
case BATTLEGROUND_RV: bg = new BattleGroundRV; break; case BATTLEGROUND_RV: bg = new BattleGroundRV; break;
case BATTLEGROUND_IC: bg = new BattleGroundIC; break; case BATTLEGROUND_IC: bg = new BattleGroundIC; break;
case BATTLEGROUND_ABG: bg = new BattleGroundABG; break; case BATTLEGROUND_RB: bg = new BattleGroundABG; break;
default:bg = new BattleGround; break; // placeholder for non implemented BG default:bg = new BattleGround; break; // placeholder for non implemented BG
} }
@ -1666,7 +1666,7 @@ void BattleGroundMgr::CreateInitialBattleGrounds()
AStartLoc[2] = start->z; AStartLoc[2] = start->z;
AStartLoc[3] = fields[6].GetFloat(); AStartLoc[3] = fields[6].GetFloat();
} }
else if (bgTypeID == BATTLEGROUND_AA || bgTypeID == BATTLEGROUND_ABG) else if (bgTypeID == BATTLEGROUND_AA || bgTypeID == BATTLEGROUND_RB)
{ {
AStartLoc[0] = 0; AStartLoc[0] = 0;
AStartLoc[1] = 0; AStartLoc[1] = 0;
@ -1689,7 +1689,7 @@ void BattleGroundMgr::CreateInitialBattleGrounds()
HStartLoc[2] = start->z; HStartLoc[2] = start->z;
HStartLoc[3] = fields[8].GetFloat(); HStartLoc[3] = fields[8].GetFloat();
} }
else if (bgTypeID == BATTLEGROUND_AA || bgTypeID == BATTLEGROUND_ABG) else if (bgTypeID == BATTLEGROUND_AA || bgTypeID == BATTLEGROUND_RB)
{ {
HStartLoc[0] = 0; HStartLoc[0] = 0;
HStartLoc[1] = 0; HStartLoc[1] = 0;
@ -1887,7 +1887,7 @@ BattleGroundQueueTypeId BattleGroundMgr::BGQueueTypeId(BattleGroundTypeId bgType
return BATTLEGROUND_QUEUE_SA; return BATTLEGROUND_QUEUE_SA;
case BATTLEGROUND_IC: case BATTLEGROUND_IC:
return BATTLEGROUND_QUEUE_IC; return BATTLEGROUND_QUEUE_IC;
case BATTLEGROUND_ABG: case BATTLEGROUND_RB:
return BATTLEGROUND_QUEUE_NONE; return BATTLEGROUND_QUEUE_NONE;
case BATTLEGROUND_AA: case BATTLEGROUND_AA:
case BATTLEGROUND_NA: case BATTLEGROUND_NA:

4
src/game/SharedDefines.h
View file

@ -2601,14 +2601,14 @@ enum BattleGroundTypeId
BATTLEGROUND_AB = 3, BATTLEGROUND_AB = 3,
BATTLEGROUND_NA = 4, BATTLEGROUND_NA = 4,
BATTLEGROUND_BE = 5, BATTLEGROUND_BE = 5,
BATTLEGROUND_AA = 6, BATTLEGROUND_AA = 6, // all arenas
BATTLEGROUND_EY = 7, BATTLEGROUND_EY = 7,
BATTLEGROUND_RL = 8, BATTLEGROUND_RL = 8,
BATTLEGROUND_SA = 9, BATTLEGROUND_SA = 9,
BATTLEGROUND_DS = 10, BATTLEGROUND_DS = 10,
BATTLEGROUND_RV = 11, BATTLEGROUND_RV = 11,
BATTLEGROUND_IC = 30, BATTLEGROUND_IC = 30,
BATTLEGROUND_ABG = 32 BATTLEGROUND_RB = 32 // random battleground
}; };
#define MAX_BATTLEGROUND_TYPE_ID 33 #define MAX_BATTLEGROUND_TYPE_ID 33

8
src/realmd/AuthSocket.cpp
View file

@ -1020,10 +1020,10 @@ void AuthSocket::LoadRealmlist(ByteBuffer &pkt, uint32 acctid)
/*if(realmFlags & REALM_FLAG_SPECIFYBUILD) /*if(realmFlags & REALM_FLAG_SPECIFYBUILD)
{ {
pkt << uint8(0); // major pkt << uint8(3); // major
pkt << uint8(0); // minor pkt << uint8(3); // minor
pkt << uint8(0); // revision pkt << uint8(3); // revision
pkt << uint16(0); // build pkt << uint16(11723); // build
}*/ }*/
} }

6
src/realmd/AuthSocket.h
View file

@ -42,9 +42,9 @@ enum RealmFlags
REALM_FLAG_SPECIFYBUILD = 0x04, // client will show realm version in RealmList screen in form "RealmName (major.minor.revision.build)" REALM_FLAG_SPECIFYBUILD = 0x04, // client will show realm version in RealmList screen in form "RealmName (major.minor.revision.build)"
REALM_FLAG_UNK1 = 0x08, REALM_FLAG_UNK1 = 0x08,
REALM_FLAG_UNK2 = 0x10, REALM_FLAG_UNK2 = 0x10,
REALM_FLAG_RECOMMENDED = 0x20, // client checks pop == 600f REALM_FLAG_NEW_PLAYERS = 0x20,
REALM_FLAG_NEW = 0x40, // client checks pop == 200f REALM_FLAG_RECOMMENDED = 0x40,
REALM_FLAG_FULL = 0x80 // client checks pop == 400f REALM_FLAG_FULL = 0x80
}; };
/// Handle login commands /// Handle login commands