Cleanup expedition headers and unused variables

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 c280615b53
commit 940c8fcb36
8 changed files with 27 additions and 53 deletions
+10 -14
View File
@@ -67,37 +67,33 @@ public:
const std::vector<uint32_t>& instance_ids);
static void HandleWorldMessage(ServerPacket* pack);
DynamicZoneType GetType() const { return m_type; }
uint64_t GetExpireTime() const { return std::chrono::system_clock::to_time_t(m_expire_time); }
uint16_t GetInstanceID() const { return static_cast<uint16_t>(m_instance_id); };
uint32_t GetSecondsRemaining() const;
uint16_t GetZoneID() const { return static_cast<uint16_t>(m_zone_id); };
uint32_t GetZoneVersion() const { return m_version; };
DynamicZoneType GetType() const { return m_type; }
DynamicZoneLocation GetCompassLocation() const { return m_compass; }
DynamicZoneLocation GetSafeReturnLocation() const { return m_safereturn; }
DynamicZoneLocation GetZoneInLocation() const { return m_zonein; }
uint32_t CreateInstance();
void AddCharacter(uint32_t character_id);
void SaveInstanceMembersToDatabase(const std::vector<uint32_t>& character_ids);
uint64_t GetExpireTime() const { return std::chrono::system_clock::to_time_t(m_expire_time); }
uint16_t GetInstanceID() const { return static_cast<uint16_t>(m_instance_id); };
//uint32_t GetRealID() const { return (m_instance_id << 16) | (m_zone_id & 0xffff); }
uint32_t GetSecondsRemaining() const;
uint16_t GetZoneID() const { return static_cast<uint16_t>(m_zone_id); };
uint32_t GetZoneVersion() const { return m_version; };
uint32_t CreateInstance();
bool HasZoneInLocation() const { return m_has_zonein; }
bool IsCurrentZoneDzInstance() const;
bool IsInstanceID(uint32_t instance_id) const;
bool IsValid() const { return m_instance_id != 0; }
void LoadFromDatabase(uint32_t instance_id);
void RemoveAllCharacters(bool enable_removal_timers = true);
void RemoveCharacter(uint32_t character_id);
void SaveInstanceMembersToDatabase(const std::vector<uint32_t>& character_ids);
uint32_t SaveToDatabase();
void SendInstanceCharacterChange(uint32_t character_id, bool removed);
void SetCompass(const DynamicZoneLocation& location, bool update_db = false);
void SetSafeReturn(const DynamicZoneLocation& location, bool update_db = false);
void SetZoneInLocation(const DynamicZoneLocation& location, bool update_db = false);
void SetUpdatedDuration(uint32_t seconds);
void LoadFromDatabase(uint32_t instance_id);
uint32_t SaveToDatabase();
private:
static std::string DynamicZoneSelectQuery();
void LoadDatabaseResult(MySQLRequestRow& row);