pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-01 01:52:02 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Push

Browse Source
This commit is contained in:
Kinglykrab
2025-06-20 14:48:07 -04:00
parent 57ee6423eb
commit 26186ee9d9
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/embparser.cpp
+1 -1
View File
@@ -997,7 +997,7 @@ int PerlembParser::SendCommands(
} }
int ret_value = 0; int ret_value = 0;
QuestManager::RunningQuest q; RunningQuest q;
if (mob && mob->IsClient()) { if (mob && mob->IsClient()) {
q.owner = other; q.owner = other;
q.initiator = mob->CastToClient(); q.initiator = mob->CastToClient();
zone/lua_parser.cpp
+8 -8
View File
@@ -507,7 +507,7 @@ int LuaParser::_EventNPC(std::string package_name, QuestEventID evt, NPC* npc, M
arg_function(this, L, npc, init, data, extra_data, extra_pointers); arg_function(this, L, npc, init, data, extra_data, extra_pointers);
Client *c = (init && init->IsClient()) ? init->CastToClient() : nullptr; Client *c = (init && init->IsClient()) ? init->CastToClient() : nullptr;
QuestManager::RunningQuest q; RunningQuest q;
q.owner = npc; q.owner = npc;
q.initiator = c; q.initiator = c;
@@ -606,7 +606,7 @@ int LuaParser::_EventPlayer(std::string package_name, QuestEventID evt, Client *
auto arg_function = PlayerArgumentDispatch[evt]; auto arg_function = PlayerArgumentDispatch[evt];
arg_function(this, L, client, data, extra_data, extra_pointers); arg_function(this, L, client, data, extra_data, extra_pointers);
QuestManager::RunningQuest q; RunningQuest q;
q.owner = client; q.owner = client;
q.initiator = client; q.initiator = client;
@@ -696,7 +696,7 @@ int LuaParser::_EventItem(std::string package_name, QuestEventID evt, Client *cl
auto arg_function = ItemArgumentDispatch[evt]; auto arg_function = ItemArgumentDispatch[evt];
arg_function(this, L, client, item, mob, data, extra_data, extra_pointers); arg_function(this, L, client, item, mob, data, extra_data, extra_pointers);
QuestManager::RunningQuest q; RunningQuest q;
q.owner = client; q.owner = client;
q.initiator = client; q.initiator = client;
@@ -785,7 +785,7 @@ int LuaParser::_EventSpell(std::string package_name, QuestEventID evt, Mob* mob,
auto arg_function = SpellArgumentDispatch[evt]; auto arg_function = SpellArgumentDispatch[evt];
arg_function(this, L, mob, client, spell_id, data, extra_data, extra_pointers); arg_function(this, L, mob, client, spell_id, data, extra_data, extra_pointers);
QuestManager::RunningQuest q; RunningQuest q;
q.owner = client; q.owner = client;
q.initiator = client; q.initiator = client;
@@ -858,7 +858,7 @@ int LuaParser::_EventEncounter(std::string package_name, QuestEventID evt, std::
auto arg_function = EncounterArgumentDispatch[evt]; auto arg_function = EncounterArgumentDispatch[evt];
arg_function(this, L, enc, data, extra_data, extra_pointers); arg_function(this, L, enc, data, extra_data, extra_pointers);
QuestManager::RunningQuest q; RunningQuest q;
q.owner = enc; q.owner = enc;
q.encounter = encounter_name; q.encounter = encounter_name;
@@ -1807,7 +1807,7 @@ int LuaParser::_EventBot(
arg_function(this, L, bot, init, data, extra_data, extra_pointers); arg_function(this, L, bot, init, data, extra_data, extra_pointers);
auto* c = (init && init->IsClient()) ? init->CastToClient() : nullptr; auto* c = (init && init->IsClient()) ? init->CastToClient() : nullptr;
QuestManager::RunningQuest q; RunningQuest q;
q.owner = bot; q.owner = bot;
q.initiator = c; q.initiator = c;
@@ -1992,7 +1992,7 @@ int LuaParser::_EventMerc(
arg_function(this, L, merc, init, data, extra_data, extra_pointers); arg_function(this, L, merc, init, data, extra_data, extra_pointers);
auto* c = (init && init->IsClient()) ? init->CastToClient() : nullptr; auto* c = (init && init->IsClient()) ? init->CastToClient() : nullptr;
QuestManager::RunningQuest q; RunningQuest q;
q.owner = merc; q.owner = merc;
q.initiator = c; q.initiator = c;
@@ -2181,7 +2181,7 @@ int LuaParser::_EventZone(
auto arg_function = ZoneArgumentDispatch[evt]; auto arg_function = ZoneArgumentDispatch[evt];
arg_function(this, L, zone, data, extra_data, extra_pointers); arg_function(this, L, zone, data, extra_data, extra_pointers);
QuestManager::RunningQuest q; RunningQuest q;
q.zone = zone; q.zone = zone;
zone/questmgr.cpp
+1 -1
View File
@@ -124,7 +124,7 @@ void QuestManager::Process() {
} }
} }
void QuestManager::StartQuest(RunningQuest q) void QuestManager::StartQuest(const RunningQuest& q)
{ {
m_running_quests.push(q); m_running_quests.push(q);
} }
zone/questmgr.h
+10 -10
View File
@@ -33,15 +33,6 @@ namespace EQ
class ItemInstance; class ItemInstance;
} }
class QuestManager {
struct PausedTimer {
Mob* owner;
std::string name;
uint32 time;
};
public:
struct RunningQuest { struct RunningQuest {
Mob* owner = nullptr; Mob* owner = nullptr;
Client* initiator = nullptr; Client* initiator = nullptr;
@@ -52,10 +43,19 @@ public:
Zone* zone = nullptr; Zone* zone = nullptr;
}; };
class QuestManager {
struct PausedTimer {
Mob* owner;
std::string name;
uint32 time;
};
public:
QuestManager(); QuestManager();
virtual ~QuestManager(); virtual ~QuestManager();
void StartQuest(RunningQuest q); void StartQuest(const RunningQuest& q);
void EndQuest(); void EndQuest();
bool QuestsRunning() { return !m_running_quests.empty(); } bool QuestsRunning() { return !m_running_quests.empty(); }