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

Merge from master terrible

Browse Source
This commit is contained in:
KimLS
2013-05-15 16:01:13 -07:00
parent 6887ae18ae 312100e1c6
commit b26df187e6
609 changed files with 37214 additions and 37933 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/lua_parser.cpp
+3 -3
View File
@@ -50,7 +50,7 @@ const char *LuaEvents[_LargestEventID] = {
"event_task_fail",
"event_aggro_say",
"event_player_pickup",
"event_popup_response",
"event_popupresponse",
"event_proximity_say",
"event_cast",
"event_scale_calc",
@@ -251,7 +251,7 @@ int LuaParser::_EventNPC(std::string package_name, QuestEventID evt, NPC* npc, M
break;
}
case EVENT_POPUP_RESPONSE:
case EVENT_POPUPRESPONSE:
case EVENT_WAYPOINT_ARRIVE:
case EVENT_WAYPOINT_DEPART: {
//client
@@ -419,7 +419,7 @@ int LuaParser::_EventPlayer(std::string package_name, QuestEventID evt, Client *
case EVENT_CLICK_OBJECT:
case EVENT_CLICKDOOR:
case EVENT_SIGNAL:
case EVENT_POPUP_RESPONSE:
case EVENT_POPUPRESPONSE:
case EVENT_PLAYER_PICKUP:
case EVENT_CAST:
case EVENT_TASK_FAIL: