diff --git a/eqlaunch/zone_launch.cpp b/eqlaunch/zone_launch.cpp index 6fea6bc8b..4e0a9a8ff 100644 --- a/eqlaunch/zone_launch.cpp +++ b/eqlaunch/zone_launch.cpp @@ -65,12 +65,12 @@ void ZoneLaunch::Start() { if(m_port) { std::string arg = m_zone + std::string(":") + std::to_string(m_port); - spec->args.emplace_back(arg); + spec->args.push_back(arg); } else { - spec->args.emplace_back(m_zone); + spec->args.push_back(m_zone); } - spec->args.emplace_back(m_launcherName); + spec->args.push_back(m_launcherName); spec->handler = this; spec->logFile = m_config->LogPrefix + m_zone + m_config->LogSuffix; diff --git a/world/eqw_parser.cpp b/world/eqw_parser.cpp index d6482783f..46cc4465c 100644 --- a/world/eqw_parser.cpp +++ b/world/eqw_parser.cpp @@ -218,8 +218,8 @@ EQWParser::~EQWParser() { bool EQWParser::eval_file(const char * packagename, const char * filename, std::string &error) { std::vector args; - args.emplace_back(packagename); - args.emplace_back(filename); + args.push_back(packagename); + args.push_back(filename); return(dosub("eval_file", args, error)); } diff --git a/zone/attack.cpp b/zone/attack.cpp index b03ad1f7e..c218a3906 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -2788,7 +2788,7 @@ bool NPC::Death(Mob* killer_mob, int64 damage, uint16 spell, EQ::skills::SkillTy combat_record.Stop(); /* Zone controller process EVENT_DEATH_ZONE (Death events) */ - args.emplace_back(this); + args.push_back(this); DispatchZoneControllerEvent(EVENT_DEATH_ZONE, oos, export_string, 0, &args); return true; @@ -3881,7 +3881,7 @@ void Mob::CommonDamage(Mob* attacker, int64 &damage, const uint16 spell_id, cons if (IsBot() && has_bot_taken_event) { parse->EventBot(EVENT_DAMAGE_TAKEN, CastToBot(), attacker ? attacker : nullptr, export_string, 0); } else if (IsClient() && has_player_taken_event) { - args.emplace_back(attacker ? attacker : nullptr); + args.push_back(attacker ? attacker : nullptr); parse->EventPlayer(EVENT_DAMAGE_TAKEN, CastToClient(), export_string, 0, &args); } else if (IsNPC() && has_npc_taken_event) { parse->EventNPC(EVENT_DAMAGE_TAKEN, CastToNPC(), attacker ? attacker : nullptr, export_string, 0); @@ -3905,7 +3905,7 @@ void Mob::CommonDamage(Mob* attacker, int64 &damage, const uint16 spell_id, cons if (attacker->IsBot() && has_bot_given_event) { parse->EventBot(EVENT_DAMAGE_GIVEN, attacker->CastToBot(), this, export_string, 0); } else if (attacker->IsClient() && has_player_given_event) { - args.emplace_back(this); + args.push_back(this); parse->EventPlayer(EVENT_DAMAGE_GIVEN, attacker->CastToClient(), export_string, 0, &args); } else if (attacker->IsNPC() && has_npc_given_event) { parse->EventNPC(EVENT_DAMAGE_GIVEN, attacker->CastToNPC(), this, export_string, 0); diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 4c9ad6c8f..c1539de21 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -468,7 +468,7 @@ int Client::HandlePacket(const EQApplicationPacket *app) if (ConnectingOpcodes.count(opcode) != 1) { //Hate const cast but everything in lua needs to be non-const even if i make it non-mutable std::vector args; - args.emplace_back(const_cast(app)); + args.push_back(const_cast(app)); parse->EventPlayer(EVENT_UNHANDLED_OPCODE, this, "", 1, &args); break; @@ -492,7 +492,7 @@ int Client::HandlePacket(const EQApplicationPacket *app) p = ConnectedOpcodes[opcode]; if (p == nullptr) { std::vector args; - args.emplace_back(const_cast(app)); + args.push_back(const_cast(app)); parse->EventPlayer(EVENT_UNHANDLED_OPCODE, this, "", 0, &args); break; @@ -3092,11 +3092,11 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app) CalcBonuses(); std::vector args; - args.emplace_back(old_aug); + args.push_back(old_aug); parse->EventItem(EVENT_UNAUGMENT_ITEM, this, tobe_auged, nullptr, "", in_augment->augment_index, &args); args.assign(1, tobe_auged); - args.emplace_back(false); + args.push_back(false); parse->EventItem(EVENT_AUGMENT_REMOVE, this, old_aug, nullptr, "", in_augment->augment_index, &args); const auto export_string = fmt::format( @@ -3108,7 +3108,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app) false ); - args.emplace_back(old_aug); + args.push_back(old_aug); parse->EventPlayer(EVENT_AUGMENT_REMOVE_CLIENT, this, export_string, 0, &args); } @@ -3119,13 +3119,13 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app) aug = tobe_auged->GetAugment(in_augment->augment_index); if (aug) { std::vector args; - args.emplace_back(aug); + args.push_back(aug); parse->EventItem(EVENT_AUGMENT_ITEM, this, tobe_auged, nullptr, "", in_augment->augment_index, &args); args.assign(1, tobe_auged); parse->EventItem(EVENT_AUGMENT_INSERT, this, aug, nullptr, "", in_augment->augment_index, &args); - args.emplace_back(aug); + args.push_back(aug); const auto export_string = fmt::format( "{} {} {} {}", @@ -3187,14 +3187,14 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app) aug = tobe_auged->GetAugment(in_augment->augment_index); if (aug) { std::vector args; - args.emplace_back(aug); + args.push_back(aug); parse->EventItem(EVENT_UNAUGMENT_ITEM, this, tobe_auged, nullptr, "", in_augment->augment_index, &args); args.assign(1, tobe_auged); - args.emplace_back(false); + args.push_back(false); parse->EventItem(EVENT_AUGMENT_REMOVE, this, aug, nullptr, "", in_augment->augment_index, &args); - args.emplace_back(aug); + args.push_back(aug); const auto export_string = fmt::format( "{} {} {} {} {}", @@ -3251,14 +3251,14 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app) aug = tobe_auged->GetAugment(in_augment->augment_index); if (aug) { std::vector args; - args.emplace_back(aug); + args.push_back(aug); parse->EventItem(EVENT_UNAUGMENT_ITEM, this, tobe_auged, nullptr, "", in_augment->augment_index, &args); args.assign(1, tobe_auged); - args.emplace_back(true); + args.push_back(true); parse->EventItem(EVENT_AUGMENT_REMOVE, this, aug, nullptr, "", in_augment->augment_index, &args); - args.emplace_back(aug); + args.push_back(aug); const auto export_string = fmt::format( "{} {} {} {} {}", @@ -4395,7 +4395,7 @@ void Client::Handle_OP_ClickDoor(const EQApplicationPacket *app) std::string export_string = fmt::format("{}", cd->doorid); std::vector args; - args.emplace_back(currentdoor); + args.push_back(currentdoor); if (parse->EventPlayer(EVENT_CLICK_DOOR, this, export_string, 0, &args) == 0) { currentdoor->HandleClick(this, 0); @@ -4418,7 +4418,7 @@ void Client::Handle_OP_ClickObject(const EQApplicationPacket *app) object->HandleClick(this, click_object); std::vector args; - args.emplace_back(object); + args.push_back(object); std::string export_string = fmt::format("{}", click_object->drop_id); parse->EventPlayer(EVENT_CLICK_OBJECT, this, export_string, GetID(), &args); diff --git a/zone/corpse.cpp b/zone/corpse.cpp index 507c3cbb5..66cb21d93 100644 --- a/zone/corpse.cpp +++ b/zone/corpse.cpp @@ -1427,8 +1427,8 @@ void Corpse::LootItem(Client *client, const EQApplicationPacket *app) GetID() ); std::vector args; - args.emplace_back(inst); - args.emplace_back(this); + args.push_back(inst); + args.push_back(this); bool prevent_loot = false; if (RuleB(Zone, UseZoneController)) { auto controller = entity_list.GetNPCByNPCTypeID(ZONE_CONTROLLER_NPC_ID); diff --git a/zone/embparser.cpp b/zone/embparser.cpp index b59109eaf..6537b8098 100644 --- a/zone/embparser.cpp +++ b/zone/embparser.cpp @@ -363,7 +363,7 @@ int PerlembParser::EventCommon( } int PerlembParser::EventNPC( - QuestEventID evt, NPC *npc, Mob *mob, const std::string& data, uint32 extra_data, + QuestEventID evt, NPC *npc, Mob *mob, std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -371,7 +371,7 @@ int PerlembParser::EventNPC( } int PerlembParser::EventGlobalNPC( - QuestEventID evt, NPC *npc, Mob *mob, const std::string& data, uint32 extra_data, + QuestEventID evt, NPC *npc, Mob *mob, std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -379,7 +379,7 @@ int PerlembParser::EventGlobalNPC( } int PerlembParser::EventPlayer( - QuestEventID evt, Client *client, const std::string& data, uint32 extra_data, + QuestEventID evt, Client *client, std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -387,7 +387,7 @@ int PerlembParser::EventPlayer( } int PerlembParser::EventGlobalPlayer( - QuestEventID evt, Client *client, const std::string& data, uint32 extra_data, + QuestEventID evt, Client *client, std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -395,7 +395,7 @@ int PerlembParser::EventGlobalPlayer( } int PerlembParser::EventItem( - QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, const std::string& data, uint32 extra_data, + QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -404,7 +404,7 @@ int PerlembParser::EventItem( } int PerlembParser::EventSpell( - QuestEventID evt, Mob *mob, Client *client, uint32 spell_id, const std::string& data, uint32 extra_data, + QuestEventID evt, Mob *mob, Client *client, uint32 spell_id, std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -2168,7 +2168,7 @@ int PerlembParser::EventBot( QuestEventID evt, Bot *bot, Mob *mob, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -2179,7 +2179,7 @@ int PerlembParser::EventGlobalBot( QuestEventID evt, Bot *bot, Mob *mob, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { diff --git a/zone/embparser.h b/zone/embparser.h index 42f55abd7..c22417a1b 100644 --- a/zone/embparser.h +++ b/zone/embparser.h @@ -52,7 +52,7 @@ public: QuestEventID evt, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -60,21 +60,21 @@ public: QuestEventID evt, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); virtual int EventPlayer( QuestEventID evt, Client *client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); virtual int EventGlobalPlayer( QuestEventID evt, Client *client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -83,7 +83,7 @@ public: Client *client, EQ::ItemInstance *item, Mob *mob, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -92,7 +92,7 @@ public: Mob* mob, Client *client, uint32 spell_id, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -100,7 +100,7 @@ public: QuestEventID evt, Bot *bot, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -108,7 +108,7 @@ public: QuestEventID evt, Bot *bot, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); diff --git a/zone/embperl.cpp b/zone/embperl.cpp index ae22fbffc..bdbe5d70e 100644 --- a/zone/embperl.cpp +++ b/zone/embperl.cpp @@ -230,8 +230,8 @@ void Embperl::init_eval_file(void) int Embperl::eval_file(const char * packagename, const char * filename) { std::vector args; - args.emplace_back(packagename); - args.emplace_back(filename); + args.push_back(packagename); + args.push_back(filename); return dosub("main::eval_file", &args); } diff --git a/zone/entity.cpp b/zone/entity.cpp index a7b2c818c..af1d4e880 100644 --- a/zone/entity.cpp +++ b/zone/entity.cpp @@ -1784,8 +1784,8 @@ void EntityList::DuelMessage(Mob *winner, Mob *loser, bool flee) { if (winner->GetLevelCon(winner->GetLevel(), loser->GetLevel()) > 2) { std::vector args; - args.emplace_back(winner); - args.emplace_back(loser); + args.push_back(winner); + args.push_back(loser); parse->EventPlayer(EVENT_DUEL_WIN, winner->CastToClient(), loser->GetName(), loser->CastToClient()->CharacterID(), &args); parse->EventPlayer(EVENT_DUEL_LOSE, loser->CastToClient(), winner->GetName(), winner->CastToClient()->CharacterID(), &args); @@ -3642,7 +3642,7 @@ void EntityList::ClearFeignAggro(Mob *targ) if (targ->IsClient()) { std::vector args; - args.emplace_back(it->second); + args.push_back(it->second); int i = parse->EventPlayer(EVENT_FEIGN_DEATH, targ->CastToClient(), "", 0, &args); if (i != 0) { ++it; @@ -3989,8 +3989,8 @@ void EntityList::ProcessMove(Client *c, const glm::vec3& location) quest_proximity_event& evt = (*iter); std::vector args; - args.emplace_back(&evt.area_id); - args.emplace_back(&evt.area_type); + args.push_back(&evt.area_id); + args.push_back(&evt.area_type); if (evt.npc) { if (evt.event_id == EVENT_ENTER) { @@ -4066,8 +4066,8 @@ void EntityList::ProcessMove(NPC *n, float x, float y, float z) { quest_proximity_event &evt = (*iter); std::vector args; - args.emplace_back(&evt.area_id); - args.emplace_back(&evt.area_type); + args.push_back(&evt.area_id); + args.push_back(&evt.area_type); if (evt.event_id == EVENT_ENTER) { parse->EventNPC(EVENT_ENTER, evt.npc, evt.client, "", 0); diff --git a/zone/forage.cpp b/zone/forage.cpp index 38aa90541..21074b4a4 100644 --- a/zone/forage.cpp +++ b/zone/forage.cpp @@ -375,7 +375,7 @@ void Client::GoFish() if (inst) { std::vector args; - args.emplace_back(inst); + args.push_back(inst); parse->EventPlayer(EVENT_FISH_SUCCESS, this, "", inst->GetID(), &args); } } @@ -495,7 +495,7 @@ void Client::ForageItem(bool guarantee) { if (inst) { std::vector args; - args.emplace_back(inst); + args.push_back(inst); parse->EventPlayer(EVENT_FORAGE_SUCCESS, this, "", inst->GetID(), &args); } } diff --git a/zone/lua_general.cpp b/zone/lua_general.cpp index d9eb5559f..7d0396ff2 100644 --- a/zone/lua_general.cpp +++ b/zone/lua_general.cpp @@ -76,9 +76,9 @@ void load_encounter_with_data(std::string name, std::string info_str) { entity_list.AddEncounter(enc); lua_encounters[name] = enc; lua_encounters_loaded[name] = true; - std::vector args; - args.emplace_back(&info_str); - parse->EventEncounter(EVENT_ENCOUNTER_LOAD, name, "", 0, &args); + std::vector info_ptrs; + info_ptrs.push_back(&info_str); + parse->EventEncounter(EVENT_ENCOUNTER_LOAD, name, "", 0, &info_ptrs); } void unload_encounter(std::string name) { @@ -138,9 +138,9 @@ void unload_encounter_with_data(std::string name, std::string info_str) { lua_encounters[name]->Depop(); lua_encounters.erase(name); lua_encounters_loaded.erase(name); - std::vector args; - args.emplace_back(&info_str); - parse->EventEncounter(EVENT_ENCOUNTER_UNLOAD, name, "", 0, &args); + std::vector info_ptrs; + info_ptrs.push_back(&info_str); + parse->EventEncounter(EVENT_ENCOUNTER_UNLOAD, name, "", 0, &info_ptrs); } void register_event(std::string package_name, std::string name, int evt, luabind::adl::object func) { diff --git a/zone/lua_parser.cpp b/zone/lua_parser.cpp index 35be8bdf4..67ac78255 100644 --- a/zone/lua_parser.cpp +++ b/zone/lua_parser.cpp @@ -339,7 +339,7 @@ LuaParser::~LuaParser() { } } -int LuaParser::EventNPC(QuestEventID evt, NPC* npc, Mob *init, const std::string& data, uint32 extra_data, +int LuaParser::EventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, std::vector *extra_pointers) { evt = ConvertLuaEvent(evt); if(evt >= _LargestEventID) { @@ -358,7 +358,7 @@ int LuaParser::EventNPC(QuestEventID evt, NPC* npc, Mob *init, const std::string return _EventNPC(package_name, evt, npc, init, data, extra_data, extra_pointers); } -int LuaParser::EventGlobalNPC(QuestEventID evt, NPC* npc, Mob *init, const std::string& data, uint32 extra_data, +int LuaParser::EventGlobalNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, std::vector *extra_pointers) { evt = ConvertLuaEvent(evt); if(evt >= _LargestEventID) { @@ -376,7 +376,7 @@ int LuaParser::EventGlobalNPC(QuestEventID evt, NPC* npc, Mob *init, const std:: return _EventNPC("global_npc", evt, npc, init, data, extra_data, extra_pointers); } -int LuaParser::_EventNPC(std::string package_name, QuestEventID evt, NPC* npc, Mob *init, const std::string& data, uint32 extra_data, +int LuaParser::_EventNPC(std::string package_name, QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, std::vector *extra_pointers, luabind::adl::object *l_func) { const char *sub_name = LuaEvents[evt]; @@ -436,7 +436,7 @@ int LuaParser::_EventNPC(std::string package_name, QuestEventID evt, NPC* npc, M return 0; } -int LuaParser::EventPlayer(QuestEventID evt, Client *client, const std::string& data, uint32 extra_data, +int LuaParser::EventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data, std::vector *extra_pointers) { evt = ConvertLuaEvent(evt); if(evt >= _LargestEventID) { @@ -454,7 +454,7 @@ int LuaParser::EventPlayer(QuestEventID evt, Client *client, const std::string& return _EventPlayer("player", evt, client, data, extra_data, extra_pointers); } -int LuaParser::EventGlobalPlayer(QuestEventID evt, Client *client, const std::string& data, uint32 extra_data, +int LuaParser::EventGlobalPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data, std::vector *extra_pointers) { evt = ConvertLuaEvent(evt); if(evt >= _LargestEventID) { @@ -472,7 +472,7 @@ int LuaParser::EventGlobalPlayer(QuestEventID evt, Client *client, const std::st return _EventPlayer("global_player", evt, client, data, extra_data, extra_pointers); } -int LuaParser::_EventPlayer(std::string package_name, QuestEventID evt, Client *client, const std::string& data, uint32 extra_data, +int LuaParser::_EventPlayer(std::string package_name, QuestEventID evt, Client *client, std::string data, uint32 extra_data, std::vector *extra_pointers, luabind::adl::object *l_func) { const char *sub_name = LuaEvents[evt]; int start = lua_gettop(L); @@ -530,7 +530,7 @@ int LuaParser::_EventPlayer(std::string package_name, QuestEventID evt, Client * return 0; } -int LuaParser::EventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, const std::string& data, uint32 extra_data, +int LuaParser::EventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, std::vector *extra_pointers) { evt = ConvertLuaEvent(evt); if(evt >= _LargestEventID) { @@ -551,7 +551,7 @@ int LuaParser::EventItem(QuestEventID evt, Client *client, EQ::ItemInstance *ite } int LuaParser::_EventItem(std::string package_name, QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, - const std::string& data, uint32 extra_data, std::vector *extra_pointers, luabind::adl::object *l_func) { + std::string data, uint32 extra_data, std::vector *extra_pointers, luabind::adl::object *l_func) { const char *sub_name = LuaEvents[evt]; int start = lua_gettop(L); @@ -615,7 +615,7 @@ int LuaParser::_EventItem(std::string package_name, QuestEventID evt, Client *cl return 0; } -int LuaParser::EventSpell(QuestEventID evt, Mob* mob, Client *client, uint32 spell_id, const std::string& data, uint32 extra_data, +int LuaParser::EventSpell(QuestEventID evt, Mob* mob, Client *client, uint32 spell_id, std::string data, uint32 extra_data, std::vector *extra_pointers) { evt = ConvertLuaEvent(evt); if(evt >= _LargestEventID) { @@ -631,7 +631,7 @@ int LuaParser::EventSpell(QuestEventID evt, Mob* mob, Client *client, uint32 spe return _EventSpell(package_name, evt, mob, client, spell_id, data, extra_data, extra_pointers); } -int LuaParser::_EventSpell(std::string package_name, QuestEventID evt, Mob* mob, Client *client, uint32 spell_id, const std::string& data, uint32 extra_data, +int LuaParser::_EventSpell(std::string package_name, QuestEventID evt, Mob* mob, Client *client, uint32 spell_id, std::string data, uint32 extra_data, std::vector *extra_pointers, luabind::adl::object *l_func) { const char *sub_name = LuaEvents[evt]; @@ -697,7 +697,7 @@ int LuaParser::_EventSpell(std::string package_name, QuestEventID evt, Mob* mob, return 0; } -int LuaParser::EventEncounter(QuestEventID evt, std::string encounter_name, const std::string& data, uint32 extra_data, std::vector *extra_pointers) { +int LuaParser::EventEncounter(QuestEventID evt, std::string encounter_name, std::string data, uint32 extra_data, std::vector *extra_pointers) { evt = ConvertLuaEvent(evt); if(evt >= _LargestEventID) { return 0; @@ -712,7 +712,7 @@ int LuaParser::EventEncounter(QuestEventID evt, std::string encounter_name, cons return _EventEncounter(package_name, evt, encounter_name, data, extra_data, extra_pointers); } -int LuaParser::_EventEncounter(std::string package_name, QuestEventID evt, std::string encounter_name, const std::string& data, uint32 extra_data, +int LuaParser::_EventEncounter(std::string package_name, QuestEventID evt, std::string encounter_name, std::string data, uint32 extra_data, std::vector *extra_pointers) { const char *sub_name = LuaEvents[evt]; @@ -1242,7 +1242,7 @@ void LuaParser::MapFunctions(lua_State *L) { } } -int LuaParser::DispatchEventNPC(QuestEventID evt, NPC* npc, Mob *init, const std::string& data, uint32 extra_data, +int LuaParser::DispatchEventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, std::vector *extra_pointers) { evt = ConvertLuaEvent(evt); if(evt >= _LargestEventID) { @@ -1288,7 +1288,7 @@ int LuaParser::DispatchEventNPC(QuestEventID evt, NPC* npc, Mob *init, const std return ret; } -int LuaParser::DispatchEventPlayer(QuestEventID evt, Client *client, const std::string& data, uint32 extra_data, +int LuaParser::DispatchEventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data, std::vector *extra_pointers) { evt = ConvertLuaEvent(evt); if(evt >= _LargestEventID) { @@ -1317,7 +1317,7 @@ int LuaParser::DispatchEventPlayer(QuestEventID evt, Client *client, const std:: return ret; } -int LuaParser::DispatchEventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, const std::string& data, uint32 extra_data, +int LuaParser::DispatchEventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, std::vector *extra_pointers) { evt = ConvertLuaEvent(evt); if(evt >= _LargestEventID) { @@ -1363,7 +1363,7 @@ int LuaParser::DispatchEventItem(QuestEventID evt, Client *client, EQ::ItemInsta return ret; } -int LuaParser::DispatchEventSpell(QuestEventID evt, Mob* mob, Client *client, uint32 spell_id, const std::string& data, uint32 extra_data, +int LuaParser::DispatchEventSpell(QuestEventID evt, Mob* mob, Client *client, uint32 spell_id, std::string data, uint32 extra_data, std::vector *extra_pointers) { evt = ConvertLuaEvent(evt); if(evt >= _LargestEventID) { @@ -1517,7 +1517,7 @@ int LuaParser::EventBot( QuestEventID evt, Bot *bot, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1541,7 +1541,7 @@ int LuaParser::EventGlobalBot( QuestEventID evt, Bot *bot, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1566,7 +1566,7 @@ int LuaParser::_EventBot( QuestEventID evt, Bot *bot, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers, luabind::adl::object *l_func @@ -1632,7 +1632,7 @@ int LuaParser::DispatchEventBot( QuestEventID evt, Bot *bot, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { diff --git a/zone/lua_parser.h b/zone/lua_parser.h index af37bcbbb..646c9f803 100644 --- a/zone/lua_parser.h +++ b/zone/lua_parser.h @@ -40,7 +40,7 @@ public: QuestEventID evt, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -48,21 +48,21 @@ public: QuestEventID evt, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); virtual int EventPlayer( QuestEventID evt, Client *client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); virtual int EventGlobalPlayer( QuestEventID evt, Client *client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -71,7 +71,7 @@ public: Client *client, EQ::ItemInstance *item, Mob *mob, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -80,14 +80,14 @@ public: Mob* mob, Client *client, uint32 spell_id, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); virtual int EventEncounter( QuestEventID evt, std::string encounter_name, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -95,7 +95,7 @@ public: QuestEventID evt, Bot *bot, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -103,7 +103,7 @@ public: QuestEventID evt, Bot *bot, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -140,14 +140,14 @@ public: QuestEventID evt, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); virtual int DispatchEventPlayer( QuestEventID evt, Client *client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -156,7 +156,7 @@ public: Client *client, EQ::ItemInstance *item, Mob *mob, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -165,7 +165,7 @@ public: Mob* mob, Client *client, uint32 spell_id, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -173,7 +173,7 @@ public: QuestEventID evt, Bot *bot, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -207,7 +207,7 @@ private: QuestEventID evt, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers, luabind::adl::object *l_func = nullptr @@ -216,7 +216,7 @@ private: std::string package_name, QuestEventID evt, Client *client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers, luabind::adl::object *l_func = nullptr @@ -227,7 +227,7 @@ private: Client *client, EQ::ItemInstance *item, Mob *mob, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers, luabind::adl::object *l_func = nullptr @@ -238,7 +238,7 @@ private: Mob* mob, Client *client, uint32 spell_id, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers, luabind::adl::object *l_func = nullptr @@ -247,7 +247,7 @@ private: std::string package_name, QuestEventID evt, std::string encounter_name, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -256,7 +256,7 @@ private: QuestEventID evt, Bot *bot, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers, luabind::adl::object *l_func = nullptr diff --git a/zone/lua_parser_events.cpp b/zone/lua_parser_events.cpp index 486b08353..99d4f23db 100644 --- a/zone/lua_parser_events.cpp +++ b/zone/lua_parser_events.cpp @@ -32,7 +32,7 @@ void handle_npc_event_say( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -55,7 +55,7 @@ void handle_npc_event_trade( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -113,7 +113,7 @@ void handle_npc_event_hp( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -137,7 +137,7 @@ void handle_npc_single_mob( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -152,7 +152,7 @@ void handle_npc_single_client( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -162,12 +162,27 @@ void handle_npc_single_client( lua_setfield(L, -2, "other"); } +void handle_npc_single_npc( + QuestInterface *parse, + lua_State* L, + NPC* npc, + Mob *init, + std::string data, + uint32 extra_data, + std::vector *extra_pointers +) { + Lua_NPC l_npc(reinterpret_cast(init)); + luabind::adl::object l_npc_o = luabind::adl::object(L, l_npc); + l_npc_o.push(L); + lua_setfield(L, -2, "other"); +} + void handle_npc_task_accepted( QuestInterface *parse, lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -185,7 +200,7 @@ void handle_npc_popup( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -203,7 +218,7 @@ void handle_npc_waypoint( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -221,7 +236,7 @@ void handle_npc_hate( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -230,7 +245,7 @@ void handle_npc_hate( l_mob_o.push(L); lua_setfield(L, -2, "other"); - lua_pushboolean(L, std::stoi(data) != 0); + lua_pushboolean(L, std::stoi(data) == 0 ? false : true); lua_setfield(L, -2, "joined"); } @@ -240,7 +255,7 @@ void handle_npc_signal( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -253,7 +268,7 @@ void handle_npc_payload( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -271,7 +286,7 @@ void handle_npc_timer( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -284,7 +299,7 @@ void handle_npc_death( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -338,7 +353,7 @@ void handle_npc_cast( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -361,7 +376,7 @@ void handle_npc_area( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -377,7 +392,7 @@ void handle_npc_null( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -388,7 +403,7 @@ void handle_npc_loot_zone( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -413,7 +428,7 @@ void handle_npc_spawn_zone( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -428,7 +443,7 @@ void handle_npc_despawn_zone( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -443,7 +458,7 @@ void handle_npc_damage( lua_State* L, NPC* npc, Mob* init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -461,16 +476,16 @@ void handle_npc_damage( lua_pushnumber(L, std::stoi(sep.arg[3])); lua_setfield(L, -2, "skill_id"); - lua_pushboolean(L, std::stoi(sep.arg[4]) != 0); + lua_pushboolean(L, std::stoi(sep.arg[4]) == 0 ? false : true); lua_setfield(L, -2, "is_damage_shield"); - lua_pushboolean(L, std::stoi(sep.arg[5]) != 0); + lua_pushboolean(L, std::stoi(sep.arg[5]) == 0 ? false : true); lua_setfield(L, -2, "is_avoidable"); lua_pushnumber(L, std::stoi(sep.arg[6])); lua_setfield(L, -2, "buff_slot"); - lua_pushboolean(L, std::stoi(sep.arg[7]) != 0); + lua_pushboolean(L, std::stoi(sep.arg[7]) == 0 ? false : true); lua_setfield(L, -2, "is_buff_tic"); lua_pushnumber(L, std::stoi(sep.arg[8])); @@ -487,7 +502,7 @@ void handle_player_say( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -502,7 +517,7 @@ void handle_player_environmental_damage( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -521,7 +536,7 @@ void handle_player_death( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -560,7 +575,7 @@ void handle_player_timer( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -572,7 +587,7 @@ void handle_player_discover_item( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -594,7 +609,7 @@ void handle_player_fish_forage_success( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -608,7 +623,7 @@ void handle_player_click_object( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -622,7 +637,7 @@ void handle_player_click_door( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -636,7 +651,7 @@ void handle_player_signal( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -648,7 +663,7 @@ void handle_player_payload( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -665,7 +680,7 @@ void handle_player_popup_response( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -677,7 +692,7 @@ void handle_player_pick_up( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -691,7 +706,7 @@ void handle_player_cast( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -721,7 +736,7 @@ void handle_player_task_fail( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -733,7 +748,7 @@ void handle_player_zone( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -762,7 +777,7 @@ void handle_player_duel_win( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -776,7 +791,7 @@ void handle_player_duel_loss( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -790,7 +805,7 @@ void handle_player_loot( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -809,7 +824,7 @@ void handle_player_task_stage_complete( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -825,7 +840,7 @@ void handle_player_task_update( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -844,7 +859,7 @@ void handle_player_command( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -869,7 +884,7 @@ void handle_player_combine( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -884,7 +899,7 @@ void handle_player_feign( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -898,7 +913,7 @@ void handle_player_area( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -913,7 +928,7 @@ void handle_player_respawn( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -928,7 +943,7 @@ void handle_player_packet( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -945,7 +960,7 @@ void handle_player_null( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -955,7 +970,7 @@ void handle_player_use_skill( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -971,7 +986,7 @@ void handle_test_buff( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -981,7 +996,7 @@ void handle_player_combine_validate( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1012,7 +1027,7 @@ void handle_player_bot_command( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1037,7 +1052,7 @@ void handle_player_warp( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1056,7 +1071,7 @@ void handle_player_quest_combine( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1068,7 +1083,7 @@ void handle_player_consider( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1080,7 +1095,7 @@ void handle_player_consider_corpse( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1092,7 +1107,7 @@ void handle_player_inspect( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1106,7 +1121,7 @@ void handle_player_aa_buy( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1128,7 +1143,7 @@ void handle_player_aa_gain( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1140,7 +1155,7 @@ void handle_player_level_up( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1152,7 +1167,7 @@ void handle_player_level_down( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1164,7 +1179,7 @@ void handle_player_gm_command( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1176,7 +1191,7 @@ void handle_player_bot_create( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1201,7 +1216,7 @@ void handle_player_damage( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1219,16 +1234,16 @@ void handle_player_damage( lua_pushnumber(L, std::stoi(sep.arg[3])); lua_setfield(L, -2, "skill_id"); - lua_pushboolean(L, std::stoi(sep.arg[4]) != 0); + lua_pushboolean(L, std::stoi(sep.arg[4]) == 0 ? false : true); lua_setfield(L, -2, "is_damage_shield"); - lua_pushboolean(L, std::stoi(sep.arg[5]) != 0); + lua_pushboolean(L, std::stoi(sep.arg[5]) == 0 ? false : true); lua_setfield(L, -2, "is_avoidable"); lua_pushnumber(L, std::stoi(sep.arg[6])); lua_setfield(L, -2, "buff_slot"); - lua_pushboolean(L, std::stoi(sep.arg[7]) != 0); + lua_pushboolean(L, std::stoi(sep.arg[7]) == 0 ? false : true); lua_setfield(L, -2, "is_buff_tic"); lua_pushnumber(L, std::stoi(sep.arg[8])); @@ -1277,7 +1292,7 @@ void handle_item_click( Client* client, EQ::ItemInstance* item, Mob *mob, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1291,7 +1306,7 @@ void handle_item_timer( Client* client, EQ::ItemInstance* item, Mob *mob, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1305,7 +1320,7 @@ void handle_item_proc( Client* client, EQ::ItemInstance* item, Mob *mob, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1333,7 +1348,7 @@ void handle_item_loot( Client* client, EQ::ItemInstance* item, Mob *mob, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1356,7 +1371,7 @@ void handle_item_equip( Client* client, EQ::ItemInstance* item, Mob *mob, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1370,7 +1385,7 @@ void handle_item_augment( Client* client, EQ::ItemInstance* item, Mob *mob, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1389,7 +1404,7 @@ void handle_item_augment_insert( Client* client, EQ::ItemInstance* item, Mob *mob, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1408,7 +1423,7 @@ void handle_item_augment_remove( Client* client, EQ::ItemInstance* item, Mob *mob, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1430,7 +1445,7 @@ void handle_item_null( Client* client, EQ::ItemInstance* item, Mob *mob, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1443,7 +1458,7 @@ void handle_spell_event( Mob* mob, Client* client, uint32 spell_id, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1492,7 +1507,7 @@ void handle_translocate_finish( Mob* mob, Client* client, uint32 spell_id, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1517,7 +1532,7 @@ void handle_player_equip_item( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1544,7 +1559,7 @@ void handle_spell_null( Mob* mob, Client* client, uint32 spell_id, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1554,7 +1569,7 @@ void handle_encounter_timer( QuestInterface *parse, lua_State* L, Encounter* encounter, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1566,7 +1581,7 @@ void handle_encounter_load( QuestInterface *parse, lua_State* L, Encounter* encounter, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1587,7 +1602,7 @@ void handle_encounter_unload( QuestInterface *parse, lua_State* L, Encounter* encounter, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1602,7 +1617,7 @@ void handle_encounter_null( QuestInterface *parse, lua_State* L, Encounter* encounter, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1612,7 +1627,7 @@ void handle_player_skill_up( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1634,7 +1649,7 @@ void handle_player_language_skill_up( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1653,7 +1668,7 @@ void handle_player_alt_currency_merchant( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1678,7 +1693,7 @@ void handle_player_merchant( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1703,7 +1718,7 @@ void handle_player_augment_insert( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1735,7 +1750,7 @@ void handle_player_augment_remove( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1773,7 +1788,7 @@ void handle_bot_null( lua_State* L, Bot* bot, Mob* init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1784,7 +1799,7 @@ void handle_bot_cast( lua_State* L, Bot* bot, Mob* init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1815,7 +1830,7 @@ void handle_bot_combat( lua_State* L, Bot* bot, Mob* init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1824,7 +1839,7 @@ void handle_bot_combat( l_mob_o.push(L); lua_setfield(L, -2, "other"); - lua_pushboolean(L, std::stoi(data) != 0); + lua_pushboolean(L, std::stoi(data) == 0 ? false : true); lua_setfield(L, -2, "joined"); } @@ -1833,7 +1848,7 @@ void handle_bot_death( lua_State* L, Bot* bot, Mob* init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1870,7 +1885,7 @@ void handle_bot_popup_response( lua_State* L, Bot* bot, Mob* init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1888,7 +1903,7 @@ void handle_bot_say( lua_State* L, Bot* bot, Mob* init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1909,7 +1924,7 @@ void handle_bot_signal( lua_State* L, Bot* bot, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1922,7 +1937,7 @@ void handle_bot_payload( lua_State* L, Bot* bot, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1940,7 +1955,7 @@ void handle_bot_slay( lua_State* L, Bot* bot, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1955,7 +1970,7 @@ void handle_bot_target_change( lua_State* L, Bot* bot, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1970,7 +1985,7 @@ void handle_bot_timer( lua_State* L, Bot* bot, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -1983,7 +1998,7 @@ void handle_bot_trade( lua_State* L, Bot* bot, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -2041,7 +2056,7 @@ void handle_bot_use_skill( lua_State* L, Bot* bot, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -2058,7 +2073,7 @@ void handle_bot_equip_item( lua_State* L, Bot* bot, Mob* init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -2084,7 +2099,7 @@ void handle_bot_damage( lua_State* L, Bot* bot, Mob* init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -2102,16 +2117,16 @@ void handle_bot_damage( lua_pushnumber(L, std::stoi(sep.arg[3])); lua_setfield(L, -2, "skill_id"); - lua_pushboolean(L, std::stoi(sep.arg[4]) != 0); + lua_pushboolean(L, std::stoi(sep.arg[4]) == 0 ? false : true); lua_setfield(L, -2, "is_damage_shield"); - lua_pushboolean(L, std::stoi(sep.arg[5]) != 0); + lua_pushboolean(L, std::stoi(sep.arg[5]) == 0 ? false : true); lua_setfield(L, -2, "is_avoidable"); lua_pushnumber(L, std::stoi(sep.arg[6])); lua_setfield(L, -2, "buff_slot"); - lua_pushboolean(L, std::stoi(sep.arg[7]) != 0); + lua_pushboolean(L, std::stoi(sep.arg[7]) == 0 ? false : true); lua_setfield(L, -2, "is_buff_tic"); lua_pushnumber(L, std::stoi(sep.arg[8])); diff --git a/zone/lua_parser_events.h b/zone/lua_parser_events.h index 5cad1bbff..5df771676 100644 --- a/zone/lua_parser_events.h +++ b/zone/lua_parser_events.h @@ -2,12 +2,12 @@ #define _EQE_LUA_PARSER_EVENTS_H #ifdef LUA_EQEMU -typedef void(*NPCArgumentHandler)(QuestInterface*, lua_State*, NPC*, Mob*, const std::string&, uint32, std::vector*); -typedef void(*PlayerArgumentHandler)(QuestInterface*, lua_State*, Client*, const std::string&, uint32, std::vector*); -typedef void(*ItemArgumentHandler)(QuestInterface*, lua_State*, Client*, EQ::ItemInstance*, Mob*, const std::string&, uint32, std::vector*); -typedef void(*SpellArgumentHandler)(QuestInterface*, lua_State*, Mob*, Client*, uint32, const std::string&, uint32, std::vector*); -typedef void(*EncounterArgumentHandler)(QuestInterface*, lua_State*, Encounter* encounter, const std::string&, uint32, std::vector*); -typedef void(*BotArgumentHandler)(QuestInterface*, lua_State*, Bot*, Mob*, const std::string&, uint32, std::vector*); +typedef void(*NPCArgumentHandler)(QuestInterface*, lua_State*, NPC*, Mob*, std::string, uint32, std::vector*); +typedef void(*PlayerArgumentHandler)(QuestInterface*, lua_State*, Client*, std::string, uint32, std::vector*); +typedef void(*ItemArgumentHandler)(QuestInterface*, lua_State*, Client*, EQ::ItemInstance*, Mob*, std::string, uint32, std::vector*); +typedef void(*SpellArgumentHandler)(QuestInterface*, lua_State*, Mob*, Client*, uint32, std::string, uint32, std::vector*); +typedef void(*EncounterArgumentHandler)(QuestInterface*, lua_State*, Encounter* encounter, std::string, uint32, std::vector*); +typedef void(*BotArgumentHandler)(QuestInterface*, lua_State*, Bot*, Mob*, std::string, uint32, std::vector*); // NPC void handle_npc_event_say( @@ -15,7 +15,7 @@ void handle_npc_event_say( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -25,7 +25,7 @@ void handle_npc_event_trade( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -35,7 +35,7 @@ void handle_npc_event_hp( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -45,7 +45,7 @@ void handle_npc_single_mob( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -55,7 +55,17 @@ void handle_npc_single_client( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, + uint32 extra_data, + std::vector *extra_pointers +); + +void handle_npc_single_npc( + QuestInterface *parse, + lua_State* L, + NPC* npc, + Mob *init, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -65,7 +75,7 @@ void handle_npc_task_accepted( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -75,7 +85,7 @@ void handle_npc_popup( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -85,7 +95,7 @@ void handle_npc_waypoint( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -95,7 +105,7 @@ void handle_npc_hate( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -105,7 +115,7 @@ void handle_npc_signal( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -115,7 +125,7 @@ void handle_npc_timer( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -125,7 +135,7 @@ void handle_npc_death( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -135,7 +145,7 @@ void handle_npc_cast( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -145,7 +155,7 @@ void handle_npc_area( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -155,7 +165,7 @@ void handle_npc_null( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -165,7 +175,7 @@ void handle_npc_loot_zone( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -175,7 +185,7 @@ void handle_npc_spawn_zone( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -185,7 +195,7 @@ void handle_npc_payload( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -195,7 +205,7 @@ void handle_npc_despawn_zone( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -205,7 +215,7 @@ void handle_npc_damage( lua_State* L, NPC* npc, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -215,7 +225,7 @@ void handle_player_say( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -224,7 +234,7 @@ void handle_player_environmental_damage( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -233,7 +243,7 @@ void handle_player_death( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -242,7 +252,7 @@ void handle_player_timer( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -251,7 +261,7 @@ void handle_player_discover_item( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -260,7 +270,7 @@ void handle_player_fish_forage_success( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -269,7 +279,7 @@ void handle_player_click_object( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -278,7 +288,7 @@ void handle_player_click_door( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -287,7 +297,7 @@ void handle_player_signal( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -296,7 +306,7 @@ void handle_player_popup_response( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -305,7 +315,7 @@ void handle_player_pick_up( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -314,7 +324,7 @@ void handle_player_cast( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -323,7 +333,7 @@ void handle_player_task_fail( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -332,7 +342,7 @@ void handle_player_zone( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -341,7 +351,7 @@ void handle_player_duel_win( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -350,7 +360,7 @@ void handle_player_duel_loss( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -359,7 +369,7 @@ void handle_player_loot( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -368,7 +378,7 @@ void handle_player_task_stage_complete( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -377,7 +387,7 @@ void handle_player_task_update( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -386,7 +396,7 @@ void handle_player_command( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -395,7 +405,7 @@ void handle_player_combine( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -404,7 +414,7 @@ void handle_player_feign( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -413,7 +423,7 @@ void handle_player_area( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -422,7 +432,7 @@ void handle_player_respawn( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -431,7 +441,7 @@ void handle_player_packet( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -440,7 +450,7 @@ void handle_player_null( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -449,7 +459,7 @@ void handle_player_use_skill( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -458,7 +468,7 @@ void handle_test_buff( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -467,7 +477,7 @@ void handle_player_combine_validate( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -476,7 +486,7 @@ void handle_player_bot_command( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -485,7 +495,7 @@ void handle_player_warp( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -494,7 +504,7 @@ void handle_player_quest_combine( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -503,7 +513,7 @@ void handle_player_consider( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -512,7 +522,7 @@ void handle_player_consider_corpse( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -521,7 +531,7 @@ void handle_player_equip_item( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -530,7 +540,7 @@ void handle_player_skill_up( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -539,7 +549,7 @@ void handle_player_language_skill_up( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -548,7 +558,7 @@ void handle_player_alt_currency_merchant( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -557,7 +567,7 @@ void handle_player_merchant( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -566,7 +576,7 @@ void handle_player_inspect( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -575,7 +585,7 @@ void handle_player_aa_buy( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -584,7 +594,7 @@ void handle_player_aa_gain( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -593,7 +603,7 @@ void handle_player_payload( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -602,7 +612,7 @@ void handle_player_level_up( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -611,7 +621,7 @@ void handle_player_level_down( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -620,7 +630,7 @@ void handle_player_gm_command( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -629,7 +639,7 @@ void handle_player_bot_create( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -638,7 +648,7 @@ void handle_player_augment_insert( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -647,7 +657,7 @@ void handle_player_augment_remove( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -656,7 +666,7 @@ void handle_player_damage( QuestInterface *parse, lua_State* L, Client* client, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -677,7 +687,7 @@ void handle_item_click( Client* client, EQ::ItemInstance* item, Mob *mob, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -688,7 +698,7 @@ void handle_item_timer( Client* client, EQ::ItemInstance* item, Mob *mob, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -699,7 +709,7 @@ void handle_item_proc( Client* client, EQ::ItemInstance* item, Mob *mob, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -710,7 +720,7 @@ void handle_item_loot( Client* client, EQ::ItemInstance* item, Mob *mob, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -721,7 +731,7 @@ void handle_item_equip( Client* client, EQ::ItemInstance* item, Mob *mob, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -732,7 +742,7 @@ void handle_item_augment( Client* client, EQ::ItemInstance* item, Mob *mob, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -743,7 +753,7 @@ void handle_item_augment_insert( Client* client, EQ::ItemInstance* item, Mob *mob, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -754,7 +764,7 @@ void handle_item_augment_remove( Client* client, EQ::ItemInstance* item, Mob *mob, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -765,7 +775,7 @@ void handle_item_null( Client* client, EQ::ItemInstance* item, Mob *mob, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -777,7 +787,7 @@ void handle_spell_event( Mob* mob, Client* client, uint32 spell_id, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -788,7 +798,7 @@ void handle_translocate_finish( Mob* mob, Client* client, uint32 spell_id, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -799,7 +809,7 @@ void handle_spell_null( Mob* mob, Client* client, uint32 spell_id, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -809,7 +819,7 @@ void handle_encounter_timer( QuestInterface *parse, lua_State* L, Encounter* encounter, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -818,7 +828,7 @@ void handle_encounter_load( QuestInterface *parse, lua_State* L, Encounter* encounter, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -827,7 +837,7 @@ void handle_encounter_unload( QuestInterface *parse, lua_State* L, Encounter* encounter, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -836,7 +846,7 @@ void handle_encounter_null( QuestInterface *parse, lua_State* L, Encounter* encounter, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -847,7 +857,7 @@ void handle_bot_null( lua_State* L, Bot* bot, Mob* init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -857,7 +867,7 @@ void handle_bot_cast( lua_State* L, Bot* bot, Mob* init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -867,7 +877,7 @@ void handle_bot_combat( lua_State* L, Bot* bot, Mob* init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -877,7 +887,7 @@ void handle_bot_death( lua_State* L, Bot* bot, Mob* init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -887,7 +897,7 @@ void handle_bot_popup_response( lua_State* L, Bot* bot, Mob* init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -897,7 +907,7 @@ void handle_bot_say( lua_State* L, Bot* bot, Mob* init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -907,7 +917,7 @@ void handle_bot_signal( lua_State* L, Bot* bot, Mob* init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -917,7 +927,7 @@ void handle_bot_slay( lua_State* L, Bot* bot, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -927,7 +937,7 @@ void handle_bot_target_change( lua_State* L, Bot* bot, Mob* init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -937,7 +947,7 @@ void handle_bot_timer( lua_State* L, Bot* bot, Mob* init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -947,7 +957,7 @@ void handle_bot_trade( lua_State* L, Bot* bot, Mob* init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -957,7 +967,7 @@ void handle_bot_use_skill( lua_State* L, Bot* bot, Mob* init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -967,7 +977,7 @@ void handle_bot_payload( lua_State* L, Bot* bot, Mob* init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -977,7 +987,7 @@ void handle_bot_equip_item( lua_State* L, Bot* bot, Mob* init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -987,7 +997,7 @@ void handle_bot_damage( lua_State* L, Bot* bot, Mob* init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); diff --git a/zone/object.cpp b/zone/object.cpp index 9a5d1304b..1add7adff 100644 --- a/zone/object.cpp +++ b/zone/object.cpp @@ -519,7 +519,7 @@ bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object) std::string export_string = fmt::format("{}", item->ID); std::vector args; - args.emplace_back(m_inst); + args.push_back(m_inst); if(parse->EventPlayer(EVENT_PLAYER_PICKUP, sender, export_string, GetID(), &args)) { auto outapp = new EQApplicationPacket(OP_ClickObject, sizeof(ClickObject_Struct)); diff --git a/zone/quest_interface.h b/zone/quest_interface.h index 755ff14d8..cc0b45d2e 100644 --- a/zone/quest_interface.h +++ b/zone/quest_interface.h @@ -33,25 +33,25 @@ namespace EQ class QuestInterface { public: - virtual int EventNPC(QuestEventID evt, NPC* npc, Mob *init, const std::string& data, uint32 extra_data, + virtual int EventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, std::vector *extra_pointers) { return 0; } - virtual int EventGlobalNPC(QuestEventID evt, NPC* npc, Mob *init, const std::string& data, uint32 extra_data, + virtual int EventGlobalNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, std::vector *extra_pointers) { return 0; } - virtual int EventPlayer(QuestEventID evt, Client *client, const std::string& data, uint32 extra_data, + virtual int EventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data, std::vector *extra_pointers) { return 0; } - virtual int EventGlobalPlayer(QuestEventID evt, Client *client, const std::string& data, uint32 extra_data, + virtual int EventGlobalPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data, std::vector *extra_pointers) { return 0; } - virtual int EventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, const std::string& data, uint32 extra_data, + virtual int EventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, std::vector *extra_pointers) { return 0; } - virtual int EventSpell(QuestEventID evt, Mob* mob, Client *client, uint32 spell_id, const std::string& data, uint32 extra_data, + virtual int EventSpell(QuestEventID evt, Mob* mob, Client *client, uint32 spell_id, std::string data, uint32 extra_data, std::vector *extra_pointers) { return 0; } - virtual int EventEncounter(QuestEventID evt, std::string encounter_name, const std::string& data, uint32 extra_data, + virtual int EventEncounter(QuestEventID evt, std::string encounter_name, std::string data, uint32 extra_data, std::vector *extra_pointers) { return 0; } virtual int EventBot( QuestEventID evt, Bot *bot, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointer ) { @@ -62,7 +62,7 @@ public: QuestEventID evt, Bot *bot, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { @@ -90,19 +90,19 @@ public: virtual void LoadBotScript(std::string filename) { } virtual void LoadGlobalBotScript(std::string filename) { } - virtual int DispatchEventNPC(QuestEventID evt, NPC* npc, Mob *init, const std::string& data, uint32 extra_data, + virtual int DispatchEventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, std::vector *extra_pointers) { return 0; } - virtual int DispatchEventPlayer(QuestEventID evt, Client *client, const std::string& data, uint32 extra_data, + virtual int DispatchEventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data, std::vector *extra_pointers) { return 0; } - virtual int DispatchEventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, const std::string& data, uint32 extra_data, + virtual int DispatchEventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, std::vector *extra_pointers) { return 0; } - virtual int DispatchEventSpell(QuestEventID evt, Mob* mob, Client *client, uint32 spell_id, const std::string& data, uint32 extra_data, + virtual int DispatchEventSpell(QuestEventID evt, Mob* mob, Client *client, uint32 spell_id, std::string data, uint32 extra_data, std::vector *extra_pointers) { return 0; } virtual int DispatchEventBot( QuestEventID evt, Bot *bot, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ) { diff --git a/zone/quest_parser_collection.cpp b/zone/quest_parser_collection.cpp index b5ed9ff90..acd850d40 100644 --- a/zone/quest_parser_collection.cpp +++ b/zone/quest_parser_collection.cpp @@ -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 *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 *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 *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 *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 *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 *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 *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 *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 *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 &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 *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 *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 *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 *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 *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 *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 *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 *extra_pointers ) { diff --git a/zone/quest_parser_collection.h b/zone/quest_parser_collection.h index edf5a4a94..1c68eab51 100644 --- a/zone/quest_parser_collection.h +++ b/zone/quest_parser_collection.h @@ -73,22 +73,22 @@ public: bool ItemHasQuestSub(EQ::ItemInstance *itm, QuestEventID evt); bool BotHasQuestSub(QuestEventID evt); - int EventNPC(QuestEventID evt, NPC* npc, Mob *init, const std::string& data, uint32 extra_data, + int EventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, std::vector *extra_pointers = nullptr); - int EventPlayer(QuestEventID evt, Client *client, const std::string& data, uint32 extra_data, + int EventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data, std::vector *extra_pointers = nullptr); - int EventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, const std::string& data, uint32 extra_data, + int EventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, std::vector *extra_pointers = nullptr); - int EventSpell(QuestEventID evt, Mob* mob, Client *client, uint32 spell_id, const std::string& data, uint32 extra_data, + int EventSpell(QuestEventID evt, Mob* mob, Client *client, uint32 spell_id, std::string data, uint32 extra_data, std::vector *extra_pointers = nullptr); - int EventEncounter(QuestEventID evt, std::string encounter_name, const std::string& data, uint32 extra_data, + int EventEncounter(QuestEventID evt, std::string encounter_name, std::string data, uint32 extra_data, std::vector *extra_pointers = nullptr); int EventBot( QuestEventID evt, Bot *bot, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers = nullptr ); @@ -129,15 +129,15 @@ private: bool BotHasQuestSubLocal(QuestEventID evt); bool BotHasQuestSubGlobal(QuestEventID evt); - int EventNPCLocal(QuestEventID evt, NPC* npc, Mob *init, const std::string& data, uint32 extra_data, std::vector *extra_pointers); - int EventNPCGlobal(QuestEventID evt, NPC* npc, Mob *init, const std::string& data, uint32 extra_data, std::vector *extra_pointers); - int EventPlayerLocal(QuestEventID evt, Client *client, const std::string& data, uint32 extra_data, std::vector *extra_pointers); - int EventPlayerGlobal(QuestEventID evt, Client *client, const std::string& data, uint32 extra_data, std::vector *extra_pointers); + int EventNPCLocal(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, std::vector *extra_pointers); + int EventNPCGlobal(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, std::vector *extra_pointers); + int EventPlayerLocal(QuestEventID evt, Client *client, std::string data, uint32 extra_data, std::vector *extra_pointers); + int EventPlayerGlobal(QuestEventID evt, Client *client, std::string data, uint32 extra_data, std::vector *extra_pointers); int EventBotLocal( QuestEventID evt, Bot *bot, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -145,7 +145,7 @@ private: QuestEventID evt, Bot *bot, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); @@ -160,19 +160,19 @@ private: QuestInterface *GetQIByBotQuest(std::string &filename); QuestInterface *GetQIByGlobalBotQuest(std::string &filename); - int DispatchEventNPC(QuestEventID evt, NPC* npc, Mob *init, const std::string& data, uint32 extra_data, + int DispatchEventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data, std::vector *extra_pointers); - int DispatchEventPlayer(QuestEventID evt, Client *client, const std::string& data, uint32 extra_data, + int DispatchEventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data, std::vector *extra_pointers); - int DispatchEventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, const std::string& data, uint32 extra_data, + int DispatchEventItem(QuestEventID evt, Client *client, EQ::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data, std::vector *extra_pointers); - int DispatchEventSpell(QuestEventID evt, Mob* mob, Client *client, uint32 spell_id, const std::string& data, uint32 extra_data, + int DispatchEventSpell(QuestEventID evt, Mob* mob, Client *client, uint32 spell_id, std::string data, uint32 extra_data, std::vector *extra_pointers); int DispatchEventBot( QuestEventID evt, Bot *bot, Mob *init, - const std::string& data, + std::string data, uint32 extra_data, std::vector *extra_pointers ); diff --git a/zone/spawn2.cpp b/zone/spawn2.cpp index f960586db..be0971953 100644 --- a/zone/spawn2.cpp +++ b/zone/spawn2.cpp @@ -1058,10 +1058,10 @@ bool SpawnConditionManager::LoadSpawnConditions(const char* zone_name, uint32 in event.next.month = atoi(row[6]); event.next.year = atoi(row[7]); - event.enabled = atoi(row[8]) != 0; + event.enabled = atoi(row[8]) == 0 ? false : true; event.action = (SpawnEvent::Action) atoi(row[9]); event.argument = atoi(row[10]); - event.strict = atoi(row[11]) != 0; + event.strict = atoi(row[11]) == 0 ? false : true; spawn_events.push_back(event); diff --git a/zone/tradeskills.cpp b/zone/tradeskills.cpp index 20d469aad..e782dfce5 100644 --- a/zone/tradeskills.cpp +++ b/zone/tradeskills.cpp @@ -135,13 +135,13 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme EQ::ItemInstance *aug = tobe_auged->GetAugment(slot); if(aug) { std::vector args; - args.emplace_back(aug); + args.push_back(aug); parse->EventItem(EVENT_AUGMENT_ITEM, user, tobe_auged, nullptr, "", slot, &args); args.assign(1, tobe_auged); parse->EventItem(EVENT_AUGMENT_INSERT, user, aug, nullptr, "", slot, &args); - args.emplace_back(aug); + args.push_back(aug); const auto export_string = fmt::format( "{} {} {} {}", @@ -177,11 +177,11 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme return; } std::vector args; - args.emplace_back(aug); + args.push_back(aug); parse->EventItem(EVENT_UNAUGMENT_ITEM, user, tobe_auged, nullptr, "", slot, &args); args.assign(1, tobe_auged); - args.emplace_back(&is_solvent); + args.push_back(&is_solvent); parse->EventItem(EVENT_AUGMENT_REMOVE, user, aug, nullptr, "", slot, &args); }