* Cleanups and comments in Player::SendInitWorldStates.
--HG-- branch : trunk
This commit is contained in:
+20
-30
@@ -8313,26 +8313,27 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
|
|||||||
// 8 Arena season id
|
// 8 Arena season id
|
||||||
data << uint32(0xF3D) << uint32(sWorld.getConfig(CONFIG_ARENA_SEASON_ID));
|
data << uint32(0xF3D) << uint32(sWorld.getConfig(CONFIG_ARENA_SEASON_ID));
|
||||||
|
|
||||||
if(mapid == 530) // Outland
|
if (mapid == 530) // Outland
|
||||||
{
|
{
|
||||||
data << uint32(0x9bf) << uint32(0x0); // 7
|
data << uint32(0x9bf) << uint32(0x0); // 7
|
||||||
data << uint32(0x9bd) << uint32(0xF); // 8
|
data << uint32(0x9bd) << uint32(0xF); // 8
|
||||||
data << uint32(0x9bb) << uint32(0xF); // 9
|
data << uint32(0x9bb) << uint32(0xF); // 9
|
||||||
}
|
}
|
||||||
switch(zoneid)
|
|
||||||
|
// insert <field> <value>
|
||||||
|
switch (zoneid)
|
||||||
{
|
{
|
||||||
case 1:
|
case 1: // Dun Morogh
|
||||||
case 11:
|
case 11: // Wetlands
|
||||||
case 12:
|
case 12: // Elwynn Forest
|
||||||
case 38:
|
case 38: // Loch Modan
|
||||||
case 40:
|
case 40: // Westfall
|
||||||
case 51:
|
case 51: // Searing Gorge
|
||||||
case 1519:
|
case 1519: // Stormwind City
|
||||||
case 1537:
|
case 1537: // Ironforge
|
||||||
case 2257:
|
case 2257: // Deeprun Tram
|
||||||
break;
|
break;
|
||||||
case 139: // EPL
|
case 139: // Eastern Plaguelands
|
||||||
{
|
|
||||||
if(pvp && pvp->GetTypeId() == OUTDOOR_PVP_EP)
|
if(pvp && pvp->GetTypeId() == OUTDOOR_PVP_EP)
|
||||||
pvp->FillInitialWorldStates(data);
|
pvp->FillInitialWorldStates(data);
|
||||||
else
|
else
|
||||||
@@ -8371,10 +8372,8 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
|
|||||||
data << uint32(0x942) << uint32(0x0); // 8 2370
|
data << uint32(0x942) << uint32(0x0); // 8 2370
|
||||||
data << uint32(0x943) << uint32(0x0); // 9 2371
|
data << uint32(0x943) << uint32(0x0); // 9 2371
|
||||||
}
|
}
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case 1377: // Silithus
|
case 1377: // Silithus
|
||||||
{
|
|
||||||
if (pvp && pvp->GetTypeId() == OUTDOOR_PVP_SI)
|
if (pvp && pvp->GetTypeId() == OUTDOOR_PVP_SI)
|
||||||
pvp->FillInitialWorldStates(data);
|
pvp->FillInitialWorldStates(data);
|
||||||
else
|
else
|
||||||
@@ -8389,9 +8388,8 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
|
|||||||
data << uint32(2323) << uint32(0x0); // 11 sandworm S
|
data << uint32(2323) << uint32(0x0); // 11 sandworm S
|
||||||
data << uint32(2324) << uint32(0x0); // 12 sandworm SW
|
data << uint32(2324) << uint32(0x0); // 12 sandworm SW
|
||||||
data << uint32(2325) << uint32(0x0); // 13 sandworm E
|
data << uint32(2325) << uint32(0x0); // 13 sandworm E
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case 2597: // AV
|
case 2597: // Alterac Valley
|
||||||
if (bg && bg->GetTypeID() == BATTLEGROUND_AV)
|
if (bg && bg->GetTypeID() == BATTLEGROUND_AV)
|
||||||
bg->FillInitialWorldStates(data);
|
bg->FillInitialWorldStates(data);
|
||||||
else
|
else
|
||||||
@@ -8473,7 +8471,7 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
|
|||||||
data << uint32(0x52d) << uint32(0x1); // 81 stormpike first aid a_c
|
data << uint32(0x52d) << uint32(0x1); // 81 stormpike first aid a_c
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 3277: // WS
|
case 3277: // Warsong Gulch
|
||||||
if (bg && bg->GetTypeID() == BATTLEGROUND_WS)
|
if (bg && bg->GetTypeID() == BATTLEGROUND_WS)
|
||||||
bg->FillInitialWorldStates(data);
|
bg->FillInitialWorldStates(data);
|
||||||
else
|
else
|
||||||
@@ -8488,7 +8486,7 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
|
|||||||
data << uint32(0x923) << uint32(0x1); // 14 2339 alliance (0 - hide, 1 - flag ok, 2 - flag picked up (flashing), 3 - flag picked up (not flashing)
|
data << uint32(0x923) << uint32(0x1); // 14 2339 alliance (0 - hide, 1 - flag ok, 2 - flag picked up (flashing), 3 - flag picked up (not flashing)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 3358: // AB
|
case 3358: // Arathi Basin
|
||||||
if (bg && bg->GetTypeID() == BATTLEGROUND_AB)
|
if (bg && bg->GetTypeID() == BATTLEGROUND_AB)
|
||||||
bg->FillInitialWorldStates(data);
|
bg->FillInitialWorldStates(data);
|
||||||
else
|
else
|
||||||
@@ -8527,7 +8525,7 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
|
|||||||
data << uint32(0x7a3) << uint32(0x708); // 38 1955 warning limit (1800)
|
data << uint32(0x7a3) << uint32(0x708); // 38 1955 warning limit (1800)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 3820: // EY
|
case 3820: // Eye of the Storm
|
||||||
if (bg && bg->GetTypeID() == BATTLEGROUND_EY)
|
if (bg && bg->GetTypeID() == BATTLEGROUND_EY)
|
||||||
bg->FillInitialWorldStates(data);
|
bg->FillInitialWorldStates(data);
|
||||||
else
|
else
|
||||||
@@ -8570,7 +8568,6 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
|
|||||||
// any of these needs change! the client remembers the prev setting!
|
// any of these needs change! the client remembers the prev setting!
|
||||||
// ON EVERY ZONE LEAVE, RESET THE OLD ZONE'S WORLD STATE, BUT AT LEAST THE UI STUFF!
|
// ON EVERY ZONE LEAVE, RESET THE OLD ZONE'S WORLD STATE, BUT AT LEAST THE UI STUFF!
|
||||||
case 3483: // Hellfire Peninsula
|
case 3483: // Hellfire Peninsula
|
||||||
{
|
|
||||||
if(pvp && pvp->GetTypeId() == OUTDOOR_PVP_HP)
|
if(pvp && pvp->GetTypeId() == OUTDOOR_PVP_HP)
|
||||||
pvp->FillInitialWorldStates(data);
|
pvp->FillInitialWorldStates(data);
|
||||||
else
|
else
|
||||||
@@ -8592,10 +8589,8 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
|
|||||||
data << uint32(0x9a7) << uint32(0x0); // 21 // show the ally stadium icon // 2471
|
data << uint32(0x9a7) << uint32(0x0); // 21 // show the ally stadium icon // 2471
|
||||||
data << uint32(0x9a6) << uint32(0x1); // 22 // show the horde stadium icon // 2470
|
data << uint32(0x9a6) << uint32(0x1); // 22 // show the horde stadium icon // 2470
|
||||||
}
|
}
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case 3518:
|
case 3518: // Nagrand
|
||||||
{
|
|
||||||
if(pvp && pvp->GetTypeId() == OUTDOOR_PVP_NA)
|
if(pvp && pvp->GetTypeId() == OUTDOOR_PVP_NA)
|
||||||
pvp->FillInitialWorldStates(data);
|
pvp->FillInitialWorldStates(data);
|
||||||
else
|
else
|
||||||
@@ -8635,10 +8630,8 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
|
|||||||
data << uint32(2672) << uint32(0x0); // 36
|
data << uint32(2672) << uint32(0x0); // 36
|
||||||
data << uint32(2673) << uint32(0x0); // 37
|
data << uint32(2673) << uint32(0x0); // 37
|
||||||
}
|
}
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case 3519: // Terokkar Forest
|
case 3519: // Terokkar Forest
|
||||||
{
|
|
||||||
if(pvp && pvp->GetTypeId() == OUTDOOR_PVP_TF)
|
if(pvp && pvp->GetTypeId() == OUTDOOR_PVP_TF)
|
||||||
pvp->FillInitialWorldStates(data);
|
pvp->FillInitialWorldStates(data);
|
||||||
else
|
else
|
||||||
@@ -8671,10 +8664,8 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
|
|||||||
data << uint32(0xad0) << uint32(0x0); // 35 // 2768 horde locked time show
|
data << uint32(0xad0) << uint32(0x0); // 35 // 2768 horde locked time show
|
||||||
data << uint32(0xacf) << uint32(0x1); // 36 // 2767 ally locked time show
|
data << uint32(0xacf) << uint32(0x1); // 36 // 2767 ally locked time show
|
||||||
}
|
}
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case 3521: // Zangarmarsh
|
case 3521: // Zangarmarsh
|
||||||
{
|
|
||||||
if(pvp && pvp->GetTypeId() == OUTDOOR_PVP_ZM)
|
if(pvp && pvp->GetTypeId() == OUTDOOR_PVP_ZM)
|
||||||
pvp->FillInitialWorldStates(data);
|
pvp->FillInitialWorldStates(data);
|
||||||
else
|
else
|
||||||
@@ -8706,7 +8697,6 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
|
|||||||
data << uint32(0xa60) << uint32(0x1); // 34
|
data << uint32(0xa60) << uint32(0x1); // 34
|
||||||
data << uint32(0xa5f) << uint32(0x0); // 35
|
data << uint32(0xa5f) << uint32(0x0); // 35
|
||||||
}
|
}
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case 3698: // Nagrand Arena
|
case 3698: // Nagrand Arena
|
||||||
if (bg && bg->GetTypeID() == BATTLEGROUND_NA)
|
if (bg && bg->GetTypeID() == BATTLEGROUND_NA)
|
||||||
@@ -8749,7 +8739,7 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 3703: // Shattrath City
|
case 3703: // Shattrath City
|
||||||
case 4384: // SA
|
case 4384: // Strand of the Ancients
|
||||||
if (bg && bg->GetTypeID() == BATTLEGROUND_SA)
|
if (bg && bg->GetTypeID() == BATTLEGROUND_SA)
|
||||||
bg->FillInitialWorldStates(data);
|
bg->FillInitialWorldStates(data);
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in New Issue
Block a user