Core/WorldStates: Migrate Tol Barad worldstates to new system
This commit is contained in:
1 parent
9f85a104d7
commit
fe7e42b0b8
11 files changed
+151
-282
No files matched your search
@@ -8789,7 +8789,6 @@ void Player::SendInitWorldStates(uint32 zoneId, uint32 areaId)
|
||||
uint32 mapid = GetMapId();
|
||||
OutdoorPvP* pvp = sOutdoorPvPMgr->GetOutdoorPvPToZoneId(zoneId);
|
||||
InstanceScript* instance = GetInstanceScript();
|
||||
Battlefield* bf = sBattlefieldMgr->GetBattlefieldToZoneId(zoneId);
|
||||
|
||||
TC_LOG_DEBUG("network", "Sending SMSG_INIT_WORLD_STATES to Map: %u, Zone: %u", mapid, zoneId);
|
||||
|
||||
@@ -9391,29 +9390,12 @@ void Player::SendInitWorldStates(uint32 zoneId, uint32 areaId)
|
||||
if (bg && bg->GetTypeID(true) == BATTLEGROUND_BFG)
|
||||
bg->FillInitialWorldStates(packet);
|
||||
break;
|
||||
// Tol Barad Peninsula
|
||||
case 5389:
|
||||
if (sWorld->getBoolConfig(CONFIG_TOLBARAD_ENABLE))
|
||||
{
|
||||
packet.Worldstates.emplace_back(WS_BATTLEFIELD_TB_ALLIANCE_CONTROLS_SHOW, sWorld->getWorldState(WS_BATTLEFIELD_TB_ALLIANCE_CONTROLS_SHOW));
|
||||
packet.Worldstates.emplace_back(WS_BATTLEFIELD_TB_HORDE_CONTROLS_SHOW, sWorld->getWorldState(WS_BATTLEFIELD_TB_HORDE_CONTROLS_SHOW));
|
||||
packet.Worldstates.emplace_back(WS_BATTLEFIELD_TB_TIME_NEXT_BATTLE_SHOW, sWorld->getWorldState(WS_BATTLEFIELD_TB_TIME_NEXT_BATTLE_SHOW));
|
||||
packet.Worldstates.emplace_back(WS_BATTLEFIELD_TB_ALLIANCE_ATTACKING_SHOW, sWorld->getWorldState(WS_BATTLEFIELD_TB_ALLIANCE_ATTACKING_SHOW));
|
||||
packet.Worldstates.emplace_back(WS_BATTLEFIELD_TB_HORDE_ATTACKING_SHOW, sWorld->getWorldState(WS_BATTLEFIELD_TB_HORDE_ATTACKING_SHOW));
|
||||
}
|
||||
break;
|
||||
// Tol Barad
|
||||
case 5095:
|
||||
if (bf && bf->GetTypeId() == BATTLEFIELD_TB)
|
||||
bf->FillInitialWorldStates(packet);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
SendDirectMessage(packet.Write());
|
||||
SendBGWeekendWorldStates();
|
||||
SendBattlefieldWorldStates();
|
||||
}
|
||||
|
||||
void Player::SendBGWeekendWorldStates() const
|
||||
@@ -9431,21 +9413,6 @@ void Player::SendBGWeekendWorldStates() const
|
||||
}
|
||||
}
|
||||
|
||||
void Player::SendBattlefieldWorldStates() const
|
||||
{
|
||||
/// Send misc stuff that needs to be sent on every login, like the battle timers.
|
||||
if (sWorld->getBoolConfig(CONFIG_TOLBARAD_ENABLE))
|
||||
{
|
||||
if (Battlefield* tb = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_TB))
|
||||
{
|
||||
SendUpdateWorldState(WS_BATTLEFIELD_TB_FACTION_CONTROLLING, uint32(tb->GetDefenderTeam() + 1));
|
||||
uint32 timer = tb->GetTimer() / 1000;
|
||||
SendUpdateWorldState(WS_BATTLEFIELD_TB_TIME_BATTLE_END, uint32(tb->IsWarTime() ? uint32(GameTime::GetGameTime() + timer) : 0));
|
||||
SendUpdateWorldState(WS_BATTLEFIELD_TB_TIME_NEXT_BATTLE, uint32(!tb->IsWarTime() ? uint32(GameTime::GetGameTime() + timer) : 0));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
uint32 Player::GetXPRestBonus(uint32 xp)
|
||||
{
|
||||
uint32 rested_bonus = (uint32)GetRestBonus(); // xp for each rested bonus
|
||||
|
||||
Reference in new issue
Block a user