pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-17 07:18:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "[Quest API] Cleanup string copies and push_backs. (#2807)"

Browse Source 
This reverts commit bcc2e022dc.
This commit is contained in:
Akkadius
2023-01-31 20:30:34 -06:00
parent f727c9f75a
commit 54050924d8
21 changed files with 397 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/quest_parser_collection.cpp
+17 -17
View File
@@ -293,7 +293,7 @@ bool QuestParserCollection::HasEncounterSub(QuestEventID evt, const std::string&
return false;
}
int QuestParserCollection::EventNPC(QuestEventID evt, NPC *npc, Mob *init, const std::string& data, uint32 extra_data,
int QuestParserCollection::EventNPC(QuestEventID evt, NPC *npc, Mob *init, std::string data, uint32 extra_data,
std::vector<std::any> *extra_pointers) {
int rd = DispatchEventNPC(evt, npc, init, data, extra_data, extra_pointers);
int rl = EventNPCLocal(evt, npc, init, data, extra_data, extra_pointers);
@@ -311,7 +311,7 @@ int QuestParserCollection::EventNPC(QuestEventID evt, NPC *npc, Mob *init, const
return 0;
}
int QuestParserCollection::EventNPCLocal(QuestEventID evt, NPC* npc, Mob *init, const std::string& data, uint32 extra_data,
int QuestParserCollection::EventNPCLocal(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data,
std::vector<std::any> *extra_pointers) {
auto iter = _npc_quest_status.find(npc->GetNPCTypeID());
if(iter != _npc_quest_status.end()) {
@@ -334,7 +334,7 @@ int QuestParserCollection::EventNPCLocal(QuestEventID evt, NPC* npc, Mob *init,
return 0;
}
int QuestParserCollection::EventNPCGlobal(QuestEventID evt, NPC* npc, Mob *init, const std::string& data, uint32 extra_data,
int QuestParserCollection::EventNPCGlobal(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data,
std::vector<std::any> *extra_pointers) {
if(_global_npc_quest_status != QuestUnloaded && _global_npc_quest_status != QuestFailedToLoad) {
auto qiter = _interfaces.find(_global_npc_quest_status);
@@ -354,7 +354,7 @@ int QuestParserCollection::EventNPCGlobal(QuestEventID evt, NPC* npc, Mob *init,
return 0;
}
int QuestParserCollection::EventPlayer(QuestEventID evt, Client *client, const std::string& data, uint32 extra_data,
int QuestParserCollection::EventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data,
std::vector<std::any> *extra_pointers) {
int rd = DispatchEventPlayer(evt, client, data, extra_data, extra_pointers);
int rl = EventPlayerLocal(evt, client, data, extra_data, extra_pointers);
@@ -372,7 +372,7 @@ int QuestParserCollection::EventPlayer(QuestEventID evt, Client *client, const s
return 0;
}
int QuestParserCollection::EventPlayerLocal(QuestEventID evt, Client *client, const std::string& data, uint32 extra_data,
int QuestParserCollection::EventPlayerLocal(QuestEventID evt, Client *client, std::string data, uint32 extra_data,
std::vector<std::any> *extra_pointers) {
if(_player_quest_status == QuestUnloaded) {
std::string filename;
@@ -391,7 +391,7 @@ int QuestParserCollection::EventPlayerLocal(QuestEventID evt, Client *client, co
return 0;
}
int QuestParserCollection::EventPlayerGlobal(QuestEventID evt, Client *client, const std::string& data, uint32 extra_data,
int QuestParserCollection::EventPlayerGlobal(QuestEventID evt, Client *client, std::string data, uint32 extra_data,
std::vector<std::any> *extra_pointers) {
if(_global_player_quest_status == QuestUnloaded) {
std::string filename;
@@ -410,7 +410,7 @@ int QuestParserCollection::EventPlayerGlobal(QuestEventID evt, Client *client, c
return 0;
}
int QuestParserCollection::EventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, const std::string& data, uint32 extra_data,
int QuestParserCollection::EventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data,
std::vector<std::any> *extra_pointers) {
// needs pointer validation check on 'item' argument
@@ -463,7 +463,7 @@ int QuestParserCollection::EventSpell(
Mob* mob,
Client *client,
uint32 spell_id,
const std::string& data,
std::string data,
uint32 extra_data,
std::vector<std::any> *extra_pointers
) {
@@ -503,7 +503,7 @@ int QuestParserCollection::EventSpell(
return 0;
}
int QuestParserCollection::EventEncounter(QuestEventID evt, std::string encounter_name, const std::string& data, uint32 extra_data,
int QuestParserCollection::EventEncounter(QuestEventID evt, std::string encounter_name, std::string data, uint32 extra_data,
std::vector<std::any> *extra_pointers) {
auto iter = _encounter_quest_status.find(encounter_name);
if(iter != _encounter_quest_status.end()) {
@@ -994,7 +994,7 @@ void QuestParserCollection::GetErrors(std::list<std::string> &quest_errors) {
}
}
int QuestParserCollection::DispatchEventNPC(QuestEventID evt, NPC* npc, Mob *init, const std::string& data, uint32 extra_data,
int QuestParserCollection::DispatchEventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data,
std::vector<std::any> *extra_pointers) {
int ret = 0;
auto iter = _load_precedence.begin();
@@ -1008,7 +1008,7 @@ int QuestParserCollection::DispatchEventNPC(QuestEventID evt, NPC* npc, Mob *ini
return ret;
}
int QuestParserCollection::DispatchEventPlayer(QuestEventID evt, Client *client, const std::string& data, uint32 extra_data,
int QuestParserCollection::DispatchEventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data,
std::vector<std::any> *extra_pointers) {
int ret = 0;
auto iter = _load_precedence.begin();
@@ -1022,7 +1022,7 @@ int QuestParserCollection::DispatchEventPlayer(QuestEventID evt, Client *client,
return ret;
}
int QuestParserCollection::DispatchEventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, const std::string& data,
int QuestParserCollection::DispatchEventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, std::string data,
uint32 extra_data, std::vector<std::any> *extra_pointers) {
int ret = 0;
auto iter = _load_precedence.begin();
@@ -1041,7 +1041,7 @@ int QuestParserCollection::DispatchEventSpell(
Mob* mob,
Client *client,
uint32 spell_id,
const std::string& data,
std::string data,
uint32 extra_data,
std::vector<std::any> *extra_pointers
) {
@@ -1083,7 +1083,7 @@ int QuestParserCollection::DispatchEventBot(
QuestEventID evt,
Bot *bot,
Mob *init,
const std::string& data,
std::string data,
uint32 extra_data,
std::vector<std::any> *extra_pointers
) {
@@ -1105,7 +1105,7 @@ int QuestParserCollection::EventBot(
QuestEventID evt,
Bot *bot,
Mob *init,
const std::string& data,
std::string data,
uint32 extra_data,
std::vector<std::any> *extra_pointers
) {
@@ -1129,7 +1129,7 @@ int QuestParserCollection::EventBotLocal(
QuestEventID evt,
Bot *bot,
Mob *init,
const std::string& data,
std::string data,
uint32 extra_data,
std::vector<std::any> *extra_pointers
) {
@@ -1155,7 +1155,7 @@ int QuestParserCollection::EventBotGlobal(
QuestEventID evt,
Bot *bot,
Mob *init,
const std::string& data,
std::string data,
uint32 extra_data,
std::vector<std::any> *extra_pointers
) {