diff --git a/zone/embparser.cpp b/zone/embparser.cpp index c39426953..12fd3effb 100644 --- a/zone/embparser.cpp +++ b/zone/embparser.cpp @@ -1143,7 +1143,7 @@ void PerlembParser::ExportEventVariables(std::string &package_name, QuestEventID ItemInst *inst = EQEmu::any_cast(extra_pointers->at(i)); std::string var_name = "item"; - var_name += std::to_string(static_cast(i + 1)); + var_name += std::to_string(i + 1); if(inst) { ExportVar(package_name.c_str(), var_name.c_str(), inst->GetItem()->ID); diff --git a/zone/lua_general.cpp b/zone/lua_general.cpp index 3182ac967..034895172 100644 --- a/zone/lua_general.cpp +++ b/zone/lua_general.cpp @@ -200,7 +200,7 @@ void unregister_player_event(int evt) { void register_item_event(std::string name, int evt, int item_id, luabind::adl::object func) { std::string package_name = "item_"; - package_name += std::to_string(static_cast(item_id)); + package_name += std::to_string(item_id); if(luabind::type(func) == LUA_TFUNCTION) { register_event(package_name, name, evt, func); @@ -214,7 +214,7 @@ void register_item_event(int evt, int item_id, luabind::adl::object func) { void unregister_item_event(std::string name, int evt, int item_id) { std::string package_name = "item_"; - package_name += std::to_string(static_cast(item_id)); + package_name += std::to_string(item_id); unregister_event(package_name, name, evt); } diff --git a/zone/lua_parser.cpp b/zone/lua_parser.cpp index 1b1bfb8e8..2051b31c7 100644 --- a/zone/lua_parser.cpp +++ b/zone/lua_parser.cpp @@ -235,7 +235,7 @@ int LuaParser::EventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, return 0; } - std::string package_name = "npc_" + std::to_string(static_cast(npc->GetNPCTypeID())); + std::string package_name = "npc_" + std::to_string(npc->GetNPCTypeID()); return _EventNPC(package_name, evt, npc, init, data, extra_data, extra_pointers); } @@ -425,7 +425,7 @@ int LuaParser::EventItem(QuestEventID evt, Client *client, ItemInst *item, Mob * } std::string package_name = "item_"; - package_name += std::to_string(static_cast(item->GetID())); + package_name += std::to_string(item->GetID()); return _EventItem(package_name, evt, client, item, mob, data, extra_data, extra_pointers); } @@ -499,12 +499,12 @@ int LuaParser::EventSpell(QuestEventID evt, NPC* npc, Client *client, uint32 spe return 0; } - std::string package_name = "spell_" + std::to_string(static_cast(spell_id)); + std::string package_name = "spell_" + std::to_string(spell_id); if(!SpellHasQuestSub(spell_id, evt)) { return 0; } - + return _EventSpell(package_name, evt, npc, client, spell_id, extra_data, extra_pointers); } @@ -646,7 +646,7 @@ bool LuaParser::HasQuestSub(uint32 npc_id, QuestEventID evt) { return false; } - std::string package_name = "npc_" + std::to_string(static_cast(npc_id)); + std::string package_name = "npc_" + std::to_string(npc_id); const char *subname = LuaEvents[evt]; return HasFunction(subname, package_name); @@ -688,7 +688,7 @@ bool LuaParser::SpellHasQuestSub(uint32 spell_id, QuestEventID evt) { return false; } - std::string package_name = "spell_" + std::to_string(static_cast(spell_id)); + std::string package_name = "spell_" + std::to_string(spell_id); const char *subname = LuaEvents[evt]; return HasFunction(subname, package_name); @@ -704,7 +704,7 @@ bool LuaParser::ItemHasQuestSub(ItemInst *itm, QuestEventID evt) { } std::string package_name = "item_"; - package_name += std::to_string(static_cast(itm->GetID())); + package_name += std::to_string(itm->GetID()); const char *subname = LuaEvents[evt]; return HasFunction(subname, package_name); @@ -723,7 +723,7 @@ bool LuaParser::EncounterHasQuestSub(std::string encounter_name, QuestEventID ev } void LuaParser::LoadNPCScript(std::string filename, int npc_id) { - std::string package_name = "npc_" + std::to_string(static_cast(npc_id)); + std::string package_name = "npc_" + std::to_string(npc_id); LoadScript(filename, package_name); } @@ -744,13 +744,13 @@ void LuaParser::LoadItemScript(std::string filename, ItemInst *item) { if (item == nullptr) return; std::string package_name = "item_"; - package_name += std::to_string(static_cast(item->GetID())); + package_name += std::to_string(item->GetID()); LoadScript(filename, package_name); } void LuaParser::LoadSpellScript(std::string filename, uint32 spell_id) { - std::string package_name = "spell_" + std::to_string(static_cast(spell_id)); + std::string package_name = "spell_" + std::to_string(spell_id); LoadScript(filename, package_name); } @@ -1011,8 +1011,8 @@ int LuaParser::DispatchEventNPC(QuestEventID evt, NPC* npc, Mob *init, std::stri if(!npc) return 0; - std::string package_name = "npc_" + std::to_string(static_cast(npc->GetNPCTypeID())); - int ret = 0; + std::string package_name = "npc_" + std::to_string(npc->GetNPCTypeID()); + int ret = 0; auto iter = lua_encounter_events_registered.find(package_name); if(iter != lua_encounter_events_registered.end()) { @@ -1085,11 +1085,11 @@ int LuaParser::DispatchEventItem(QuestEventID evt, Client *client, ItemInst *ite if(!item) return 0; - + std::string package_name = "item_"; - package_name += std::to_string(static_cast(item->GetID())); - int ret = 0; - + package_name += std::to_string(item->GetID()); + int ret = 0; + auto iter = lua_encounter_events_registered.find(package_name); if(iter != lua_encounter_events_registered.end()) { auto riter = iter->second.begin(); @@ -1129,7 +1129,7 @@ int LuaParser::DispatchEventSpell(QuestEventID evt, NPC* npc, Client *client, ui return 0; } - std::string package_name = "spell_" + std::to_string(static_cast(spell_id)); + std::string package_name = "spell_" + std::to_string(spell_id); int ret = 0; auto iter = lua_encounter_events_registered.find(package_name); diff --git a/zone/lua_parser_events.cpp b/zone/lua_parser_events.cpp index 89f08a81f..dbcf86d74 100644 --- a/zone/lua_parser_events.cpp +++ b/zone/lua_parser_events.cpp @@ -56,7 +56,7 @@ void handle_npc_event_trade(QuestInterface *parse, lua_State* L, NPC* npc, Mob * if(extra_pointers) { size_t sz = extra_pointers->size(); for(size_t i = 0; i < sz; ++i) { - std::string prefix = "item" + std::to_string(static_cast(i + 1)); + std::string prefix = "item" + std::to_string(i + 1); ItemInst *inst = EQEmu::any_cast(extra_pointers->at(i)); Lua_ItemInst l_inst = inst; diff --git a/zone/quest_parser_collection.cpp b/zone/quest_parser_collection.cpp index d3bde0d5b..42af5efe0 100644 --- a/zone/quest_parser_collection.cpp +++ b/zone/quest_parser_collection.cpp @@ -206,11 +206,11 @@ bool QuestParserCollection::ItemHasQuestSub(ItemInst *itm, QuestEventID evt) { std::string item_script; if(itm->GetItem()->ScriptFileID != 0) { item_script = "script_"; - item_script += std::to_string(static_cast(itm->GetItem()->ScriptFileID)); + item_script += std::to_string(itm->GetItem()->ScriptFileID); } else if(strlen(itm->GetItem()->CharmFile) > 0) { item_script = itm->GetItem()->CharmFile; } else { - item_script = std::to_string(static_cast(itm->GetID())); + item_script = std::to_string(itm->GetID()); } uint32 item_id = itm->GetID(); @@ -358,11 +358,11 @@ int QuestParserCollection::EventItem(QuestEventID evt, Client *client, ItemInst std::string item_script; if(item->GetItem()->ScriptFileID != 0) { item_script = "script_"; - item_script += std::to_string(static_cast(item->GetItem()->ScriptFileID)); + item_script += std::to_string(item->GetItem()->ScriptFileID); } else if(strlen(item->GetItem()->CharmFile) > 0) { item_script = item->GetItem()->CharmFile; } else { - item_script = std::to_string(static_cast(item->GetID())); + item_script = std::to_string(item->GetID()); } uint32 item_id = item->GetID();