From 9b924522d0549dd67b10e2cbdfc20297dd21e182 Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 2 Jan 2020 14:19:35 +0100 Subject: Core/Instances: Delete InstanceSaveMgr and replace most of its uses with new InstanceLockMgr --- src/server/game/Server/Packets/CalendarPackets.h | 4 ++-- src/server/game/Server/WorldSession.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src/server/game/Server') diff --git a/src/server/game/Server/Packets/CalendarPackets.h b/src/server/game/Server/Packets/CalendarPackets.h index 4ee6ddbfc3a..4b45b13952c 100644 --- a/src/server/game/Server/Packets/CalendarPackets.h +++ b/src/server/game/Server/Packets/CalendarPackets.h @@ -508,11 +508,11 @@ namespace WorldPackets WorldPacket const* Write() override; - int32 MapID = 0; - int32 OldTimeRemaining = 0; time_t ServerTime = 0; + int32 MapID = 0; uint32 DifficultyID = 0; int32 NewTimeRemaining = 0; + int32 OldTimeRemaining = 0; }; struct CalendarEventInitialInviteInfo diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index 4433c91fa31..741767098a8 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -44,7 +44,6 @@ class BlackMarketEntry; class CollectionMgr; class Creature; class InstanceLock; -class InstanceSave; class Item; class LoginQueryHolder; class Player; @@ -1684,8 +1683,6 @@ class TC_GAME_API WorldSession void HandleCalendarEventSignup(WorldPackets::Calendar::CalendarEventSignUp& calendarEventSignUp); void SendCalendarRaidLockoutAdded(InstanceLock const* lock); - void SendCalendarRaidLockoutUpdated(InstanceSave const* save); - void SendCalendarRaidLockoutRemoved(InstanceSave const* save); void SendCalendarRaidLockoutRemoved(InstanceLock const* lock); void HandleSetSavedInstanceExtend(WorldPackets::Calendar::SetSavedInstanceExtend& setSavedInstanceExtend); -- cgit v1.2.3