Merge master, pretty close to RC atm

This commit is contained in:
KimLS committed 2013-06-26 12:52:00 -07:00
commit 9e1115f899
36 files changed
+483 -292

No files matched your search

+3 -1
View File
@@ -110,7 +110,8 @@ const char *LuaEvents[_LargestEventID] = {
"event_augment_insert",
"event_augment_remove",
"event_enter_area",
"event_leave_area"
"event_leave_area",
"event_respawn"
};
extern Zone *zone;
@@ -184,6 +185,7 @@ LuaParser::LuaParser() {
PlayerArgumentDispatch[EVENT_FEIGN_DEATH] = handle_player_feign;
PlayerArgumentDispatch[EVENT_ENTER_AREA] = handle_player_area;
PlayerArgumentDispatch[EVENT_LEAVE_AREA] = handle_player_area;
PlayerArgumentDispatch[EVENT_RESPAWN] = handle_player_respawn;
ItemArgumentDispatch[EVENT_ITEM_CLICK] = handle_item_click;
ItemArgumentDispatch[EVENT_ITEM_CLICK_CAST] = handle_item_click;