From 99f2aa39a7e1541ce0ce89ca09ea5935952f1921 Mon Sep 17 00:00:00 2001 From: Revision Date: Fri, 14 Feb 2025 23:42:27 +0100 Subject: [PATCH] Fixed compiled errors --- src/mod_weekendbonus.h | 3 --- src/mod_weekendbonus_config.cpp | 8 ++++++++ src/mod_weekendbonus_world.cpp | 10 +++++++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/mod_weekendbonus.h b/src/mod_weekendbonus.h index efe18d5..b2626a9 100644 --- a/src/mod_weekendbonus.h +++ b/src/mod_weekendbonus.h @@ -1,9 +1,6 @@ #ifndef MOD_WEEKENDBONUS_H #define MOD_WEEKENDBONUS_H -#include "Chat.h" -#include "Config.h" -#include "Player.h" #include "ScriptMgr.h" enum Day diff --git a/src/mod_weekendbonus_config.cpp b/src/mod_weekendbonus_config.cpp index 0921347..f39a7fa 100644 --- a/src/mod_weekendbonus_config.cpp +++ b/src/mod_weekendbonus_config.cpp @@ -1,9 +1,13 @@ #include "mod_weekendbonus.h" +#include "Config.h" + void WeekendBonus::OnAfterConfigLoad(bool reload) { if (!reload) + { LoadDefaultValues(); + } ExperienceMultiplier = sConfigMgr->GetOption("WeekendBonus.Multiplier.Experience", 2.0f); MoneyMultiplier = sConfigMgr->GetOption("WeekendBonus.Multiplier.Money", 2.0f); @@ -15,9 +19,13 @@ void WeekendBonus::OnAfterConfigLoad(bool reload) if (reload) { if ((localtime(&LocalTime)->tm_wday == Day::FRIDAY && localtime(&LocalTime)->tm_hour >= 18) || localtime(&LocalTime)->tm_wday == Day::SATURDAY || localtime(&LocalTime)->tm_wday == Day::SUNDAY) + { SetRates(true); + } else + { SetRates(false); + } } } diff --git a/src/mod_weekendbonus_world.cpp b/src/mod_weekendbonus_world.cpp index 32ef4cf..25ad854 100644 --- a/src/mod_weekendbonus_world.cpp +++ b/src/mod_weekendbonus_world.cpp @@ -1,5 +1,7 @@ #include "mod_weekendbonus.h" +#include "WorldSessionMgr.h" + void WeekendBonus::OnStartup() { if (!HasActiveMultipliers()) @@ -11,7 +13,9 @@ void WeekendBonus::OnStartup() LocalTime = time(NULL); if ((localtime(&LocalTime)->tm_wday == Day::FRIDAY && localtime(&LocalTime)->tm_hour >= 18) || localtime(&LocalTime)->tm_wday == Day::SATURDAY || localtime(&LocalTime)->tm_wday == Day::SUNDAY) + { SetRates(true); + } } void WeekendBonus::OnUpdate(uint32 diff) @@ -28,12 +32,12 @@ void WeekendBonus::OnUpdate(uint32 diff) if ((localtime(&LocalTime)->tm_wday == Day::FRIDAY && localtime(&LocalTime)->tm_hour >= 18) && !Triggered) { - sWorld->SendServerMessage(SERVER_MSG_STRING, "The weekend bonus is now active, granting you bonuses!"); + sWorldSessionMgr->SendServerMessage(SERVER_MSG_STRING, "The weekend bonus is now active, granting you bonuses!"); SetRates(true); } else if (localtime(&LocalTime)->tm_wday == Day::MONDAY && Triggered) { - sWorld->SendServerMessage(SERVER_MSG_STRING, "The weekend bonus is no longer active."); + sWorldSessionMgr->SendServerMessage(SERVER_MSG_STRING, "The weekend bonus is no longer active."); SetRates(false); } @@ -45,7 +49,7 @@ void WeekendBonus::OnUpdate(uint32 diff) AnnouncementTime += Milliseconds(diff); if (AnnouncementTime > AnnouncementFrequency) { - sWorld->SendServerMessage(SERVER_MSG_STRING, "The weekend bonus is active, granting you bonuses!"); + sWorldSessionMgr->SendServerMessage(SERVER_MSG_STRING, "The weekend bonus is active, granting you bonuses!"); AnnouncementTime = 0s; } }