From f2e666c37e33e7d10da879e39f8dd19bd22fefef Mon Sep 17 00:00:00 2001 From: Revision Date: Wed, 29 Dec 2021 05:08:14 +0100 Subject: [PATCH] Fixed Removed some useless ifs. --- src/WeekendBonus.cpp | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/WeekendBonus.cpp b/src/WeekendBonus.cpp index 45bf2d3..81353f7 100644 --- a/src/WeekendBonus.cpp +++ b/src/WeekendBonus.cpp @@ -68,21 +68,17 @@ class WeekendBonusWorld : WorldScript { localTime = time(NULL); - if (localtime(&localTime)->tm_wday == Day::FRIDAY && localtime(&localTime)->tm_hour == 0 && localtime(&localTime)->tm_min == 0) + if (localtime(&localTime)->tm_wday == Day::FRIDAY && localtime(&localTime)->tm_hour == 0 && localtime(&localTime)->tm_min == 0 && !triggered) { - if (!triggered) - { - sWorld->SendServerMessage(SERVER_MSG_STRING, "The weekend bonus is now active, granting you bonuses to experience, reputation and money!"); - SetWorldRates(); - } + sWorld->SendServerMessage(SERVER_MSG_STRING, "The weekend bonus is now active, granting you bonuses to experience, reputation and money!"); + + SetWorldRates(); } - else if (localtime(&localTime)->tm_wday == Day::MONDAY && localtime(&localTime)->tm_hour == 0 && localtime(&localTime)->tm_min == 0) + else if (localtime(&localTime)->tm_wday == Day::MONDAY && localtime(&localTime)->tm_hour == 0 && localtime(&localTime)->tm_min == 0 && triggered) { - if (triggered) - { - sWorld->SendServerMessage(SERVER_MSG_STRING, "The weekend bonus is no longer active."); - SetWorldRates(); - } + sWorld->SendServerMessage(SERVER_MSG_STRING, "The weekend bonus is no longer active."); + + SetWorldRates(); } } @@ -98,6 +94,7 @@ class WeekendBonusWorld : WorldScript sWorld->setRate(RATE_XP_PET, sWorld->getRate(RATE_XP_PET) * multiplierExperience); sWorld->setRate(RATE_DROP_MONEY, sWorld->getRate(RATE_DROP_MONEY) * multiplierMoney); sWorld->setRate(RATE_REPUTATION_GAIN, sWorld->getRate(RATE_REPUTATION_GAIN) * multiplierReputation); + triggered = true; } else @@ -110,6 +107,7 @@ class WeekendBonusWorld : WorldScript sWorld->setRate(RATE_XP_PET, sWorld->getRate(RATE_XP_PET) / multiplierExperience); sWorld->setRate(RATE_DROP_MONEY, sWorld->getRate(RATE_DROP_MONEY) / multiplierMoney); sWorld->setRate(RATE_REPUTATION_GAIN, sWorld->getRate(RATE_REPUTATION_GAIN) / multiplierReputation); + triggered = false; } }