pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 22:58:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added three new events

Browse Source
This commit is contained in:
KimLS
2013-06-06 14:29:45 -07:00
parent b87d4a3e5f
commit 8c3cce822a
8 changed files with 71 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/lua_parser.cpp
+15 -12
View File
@@ -93,7 +93,10 @@ const char *LuaEvents[_LargestEventID] = {
"event_duel_lose",
"event_encounter_load",
"event_encounter_unload",
"event_command"
"event_command",
"event_drop_item",
"event_destroy_item",
"event_feign_death"
};
extern Zone *zone;
@@ -376,8 +379,7 @@ int LuaParser::EventItem(QuestEventID evt, Client *client, ItemInst *item, uint3
return 0;
}
std::stringstream package_name;
package_name << "item_";
std::string package_name = "item_";
std::stringstream item_name;
const Item_Struct* itm = item->GetItem();
@@ -392,12 +394,11 @@ int LuaParser::EventItem(QuestEventID evt, Client *client, ItemInst *item, uint3
}
else
{
item_name << "item_";
item_name << itm->ID;
}
package_name << item_name;
package_name += item_name.str();
return _EventItem(package_name.str(), evt, client, item, objid, extra_data);
return _EventItem(package_name, evt, client, item, objid, extra_data);
}
int LuaParser::_EventItem(std::string package_name, QuestEventID evt, Client *client, ItemInst *item, uint32 objid, uint32 extra_data,
@@ -422,6 +423,11 @@ int LuaParser::_EventItem(std::string package_name, QuestEventID evt, Client *cl
l_item_o.push(L);
lua_setfield(L, -2, "self");
Lua_Client l_client(client);
luabind::object l_client_o = luabind::object(L, l_client);
l_client_o.push(L);
lua_setfield(L, -2, "owner");
auto arg_function = ItemArgumentDispatch[evt];
arg_function(this, L, client, item, objid, extra_data);
@@ -623,8 +629,7 @@ bool LuaParser::SpellHasQuestSub(uint32 spell_id, const char *subname) {
}
bool LuaParser::ItemHasQuestSub(ItemInst *itm, const char *subname) {
std::stringstream package_name;
package_name << "item_";
std::string package_name = "item_";
std::stringstream item_name;
const Item_Struct* item = itm->GetItem();
@@ -639,12 +644,11 @@ bool LuaParser::ItemHasQuestSub(ItemInst *itm, const char *subname) {
}
else
{
item_name << "item_";
item_name << item->ID;
}
package_name << item_name;
return HasFunction(subname, package_name.str());
package_name += item_name.str();
return HasFunction(subname, package_name);
}
bool LuaParser::EncounterHasQuestSub(std::string encounter_name, const char *subname) {
@@ -930,7 +934,6 @@ void LuaParser::DispatchEventItem(QuestEventID evt, Client *client, ItemInst *it
}
else
{
item_name << "item_";
item_name << itm->ID;
}
package_name << item_name;