Merge from master terrible

This commit is contained in:
KimLS
2013-05-15 16:01:13 -07:00
609 changed files with 37214 additions and 37933 deletions
+2 -2
View File
@@ -63,7 +63,7 @@ const char *QuestEventSubroutines[_LargestEventID] = {
"EVENT_TASK_FAIL",
"EVENT_AGGRO_SAY",
"EVENT_PLAYER_PICKUP",
"EVENT_POPUP_RESPONSE",
"EVENT_POPUPRESPONSE",
"EVENT_PROXIMITY_SAY",
"EVENT_CAST",
"EVENT_SCALE_CALC",
@@ -1204,7 +1204,7 @@ void PerlembParser::ExportEventVariables(std::string &package_name, QuestEventID
break;
}
case EVENT_POPUP_RESPONSE:{
case EVENT_POPUPRESPONSE:{
ExportVar(package_name.c_str(), "popupid", data);
break;
}