pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-11 20:08:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup expedition headers and unused variables

Browse Source 
Modify some expedition and dz logging

Remove unnecessary includes in expedition sources
This commit is contained in:
hg
2020-07-01 20:18:00 -04:00
parent 3843ed6540
commit 5a826add92
8 changed files with 27 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client.cpp
+2 -14
View File
@@ -9766,7 +9766,6 @@ void Client::SendExpeditionLockoutTimers()
uint32_t outsize = sizeof(ExpeditionLockoutTimers_Struct) + lockout_entries_size;
auto outapp = std::unique_ptr<EQApplicationPacket>(new EQApplicationPacket(OP_DzExpeditionLockoutTimers, outsize));
auto outbuf = reinterpret_cast<ExpeditionLockoutTimers_Struct*>(outapp->pBuffer);
outbuf->client_id = 0;
outbuf->count = lockout_count;
if (!lockout_entries.empty())
{
@@ -9853,7 +9852,7 @@ void Client::SendDzCompassUpdate()
}
}
// todo: shared tasks, missions, and quests with an associated dz
// todo: tasks, missions, and quests with an associated dz
// compass set via MarkSingleCompassLocation()
if (m_has_quest_compass)
@@ -9874,7 +9873,6 @@ void Client::SendDzCompassUpdate()
uint32 outsize = sizeof(DynamicZoneCompass_Struct) + entries_size;
auto outapp = std::unique_ptr<EQApplicationPacket>(new EQApplicationPacket(OP_DzCompass, outsize));
auto outbuf = reinterpret_cast<DynamicZoneCompass_Struct*>(outapp->pBuffer);
outbuf->client_id = 0;
outbuf->count = count;
memcpy(outbuf->entries, compass_entries.data(), entries_size);
@@ -9884,15 +9882,7 @@ void Client::SendDzCompassUpdate()
void Client::GoToDzSafeReturnOrBind(const DynamicZoneLocation& safereturn)
{
LogDynamicZonesDetail(
"Sending character [{}] in zone [{}]:[{}] to safereturn [{}] at ([{}], [{}], [{}], [{}]) or bind",
CharacterID(),
zone ? zone->GetZoneID() : 0,
zone ? zone->GetInstanceID() : 0,
safereturn.zone_id,
safereturn.x,
safereturn.y,
safereturn.z,
safereturn.heading
"Sending character [{}] to safereturn zone [{}] or bind", CharacterID(), safereturn.zone_id
);
if (safereturn.zone_id == 0)
@@ -9925,7 +9915,6 @@ void Client::MovePCDynamicZone(uint32 zone_id)
dz.dz_zone_id = expedition->GetDynamicZone().GetZoneID();
dz.dz_instance_id = expedition->GetDynamicZone().GetInstanceID();
dz.dz_type = static_cast<uint8_t>(expedition->GetDynamicZone().GetType());
//dz.unknown_id2 = expedition->GetDynamicZone().GetRealID();
strn0cpy(dz.description, expedition->GetName().c_str(), sizeof(dz.description));
strn0cpy(dz.leader_name, expedition->GetLeaderName().c_str(), sizeof(dz.leader_name));
@@ -9970,7 +9959,6 @@ void Client::MovePCDynamicZone(uint32 zone_id)
uint32 outsize = sizeof(DynamicZoneChooseZone_Struct) + entries_size;
auto outapp = std::unique_ptr<EQApplicationPacket>(new EQApplicationPacket(OP_DzChooseZone, outsize));
auto outbuf = reinterpret_cast<DynamicZoneChooseZone_Struct*>(outapp->pBuffer);
outbuf->client_id = 0;
outbuf->count = count;
memcpy(outbuf->choices, client_dzs.data(), entries_size);