pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 21:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add jank permanent reference pass back in [skip ci]

Browse Source
This commit is contained in:
Akkadius 2020-04-10 03:20:41 -05:00
parent d1349e5ac9
commit 0dc3e5ba35
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/database.h
View File

@ -159,7 +159,7 @@ public:
uint16 GetInstanceID(const char* zone, uint32 charid, int16 version); uint16 GetInstanceID(const char* zone, uint32 charid, int16 version);
uint16 GetInstanceID(uint32 zone, uint32 charid, int16 version); uint16 GetInstanceID(uint32 zone, uint32 charid, int16 version);
uint16 GetInstanceVersion(uint16 instance_id); uint16 GetInstanceVersion(uint16 instance_id);
uint32 GetTimeRemainingInstance(uint16 instance_id, bool is_perma = false); uint32 GetTimeRemainingInstance(uint16 instance_id, bool &is_perma);
uint32 VersionFromInstanceID(uint16 instance_id); uint32 VersionFromInstanceID(uint16 instance_id);
uint32 ZoneIDFromInstanceID(uint16 instance_id); uint32 ZoneIDFromInstanceID(uint16 instance_id);

2
common/database_instances.cpp
View File

@ -381,7 +381,7 @@ uint16 Database::GetInstanceVersion(uint16 instance_id) {
return atoi(row[0]); return atoi(row[0]);
} }
uint32 Database::GetTimeRemainingInstance(uint16 instance_id, bool is_perma) uint32 Database::GetTimeRemainingInstance(uint16 instance_id, bool &is_perma)
{ {
uint32 start_time = 0; uint32 start_time = 0;
uint32 duration = 0; uint32 duration = 0;

7
zone/client_packet.cpp
View File

@ -823,16 +823,15 @@ void Client::CompleteConnect()
); );
} }
if (zone && zone->GetInstanceID() > 0) { if (zone && zone->GetInstanceTimer()) {
uint32 remaining_time_seconds = database.GetTimeRemainingInstance(zone->GetInstanceID()); bool is_permanent = false;
uint32 remaining_time_seconds = database.GetTimeRemainingInstance(zone->GetInstanceID(), is_permanent);
uint32 day = (remaining_time_seconds / 86400); uint32 day = (remaining_time_seconds / 86400);
uint32 hour = (remaining_time_seconds / 3600) % 24; uint32 hour = (remaining_time_seconds / 3600) % 24;
uint32 minute = (remaining_time_seconds / 60) % 60; uint32 minute = (remaining_time_seconds / 60) % 60;
uint32 second = (remaining_time_seconds / 1) % 60; uint32 second = (remaining_time_seconds / 1) % 60;
LogInfo("Remaining time seconds [{}]", remaining_time_seconds);
if (day) { if (day) {
Message( Message(
Chat::Yellow, "%s (%u) will expire in %u days, %u hours, %u minutes, and %u seconds.", Chat::Yellow, "%s (%u) will expire in %u days, %u hours, %u minutes, and %u seconds.",