Merge master, pretty close to RC atm

This commit is contained in:
KimLS
2013-06-26 12:52:00 -07:00
36 changed files with 483 additions and 292 deletions
+8 -1
View File
@@ -109,7 +109,8 @@ const char *QuestEventSubroutines[_LargestEventID] = {
"EVENT_AUGMENT_INSERT",
"EVENT_AUGMENT_REMOVE",
"EVENT_ENTER_AREA",
"EVENT_LEAVE_AREA"
"EVENT_LEAVE_AREA",
"EVENT_RESPAWN"
};
PerlembParser::PerlembParser() : perl(nullptr), event_queue_in_use_(false) {
@@ -1381,6 +1382,12 @@ void PerlembParser::ExportEventVariables(std::string &package_name, QuestEventID
break;
}
case EVENT_RESPAWN: {
ExportVar(package_name.c_str(), "option", data);
ExportVar(package_name.c_str(), "resurrect", extradata);
break;
}
default: {
break;
}