Skip to content

fix codestyle and add enabled hook lists for performance improvement #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sudlud merged 1 commit into from
Mar 2, 2025
Merged

fix codestyle and add enabled hook lists for performance improvement #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions src/instance_reset.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,39 +111,27 @@ bool InstanceReset::OnGossipHello(Player* player, Creature* creature)
case 1:
{
if (player->HasItemCount(token, count, true))
{
AddGossipItemFor(player, GOSSIP_ICON_CHAT, gossipText, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
}
else
{
creature->Whisper("You do not have the required items or token.", LANG_UNIVERSAL, player);
}
break;
}

case 2:
{
if (player->GetMoney() >= money)
{
AddGossipItemFor(player, GOSSIP_ICON_CHAT, gossipText, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
}
else
{
creature->Whisper("You don't have enough money.", LANG_UNIVERSAL, player);
}
break;
}

case 3:
{
if ((player->HasItemCount(token, count, true)) && ((player->GetMoney() >= money)))
{
AddGossipItemFor(player, GOSSIP_ICON_CHAT, gossipText, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
}
else
{
creature->Whisper("The reset requires a token and money.", LANG_UNIVERSAL, player);
}
break;
}

Expand Down
18 changes: 11 additions & 7 deletions src/instance_reset.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#include "ScriptMgr.h"
#include "Player.h"
#include "Chat.h"
#include "Configuration/Config.h"
#include "GossipDef.h"
#include "ScriptedGossip.h"
#include "Language.h"
#include "Chat.h"
#include "Opcodes.h"
#include "Player.h"
#include "ScriptedGossip.h"
#include "ScriptMgr.h"
#include "WorldPacket.h"
#include "WorldSession.h"
#include "Opcodes.h"

void GossipSetText(Player* player, std::string message, uint32 textID);

Expand All @@ -20,7 +20,9 @@ uint32 money = 10000000;
class InstanceResetAnnouncer : public PlayerScript
{
public:
InstanceResetAnnouncer() : PlayerScript("InstanceResetAnnouncer") {}
InstanceResetAnnouncer() : PlayerScript("InstanceResetAnnouncer", {
PLAYERHOOK_ON_LOGIN
}) {}

void OnPlayerLogin(Player* player) override;
};
Expand All @@ -37,7 +39,9 @@ class InstanceReset : public CreatureScript
class InstanceResetWorldConfig : public WorldScript
{
public:
InstanceResetWorldConfig() : WorldScript("InstanceResetWorldConfig") { }
InstanceResetWorldConfig() : WorldScript("InstanceResetWorldConfig", {
WORLDHOOK_ON_BEFORE_CONFIG_LOAD
}) { }

void OnBeforeConfigLoad(bool /*reload*/) override;
};
Expand Down