mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-16 01:54:38 +02:00
Code Issues Releases Wiki Activity

fix trigger parser

Browse Source
This commit is contained in:
XProger
2018-09-29 20:09:12 +03:00
parent c93d7221d9
commit bc55f32541
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/controller.h
View File

@@ -403,15 +403,22 @@ struct Controller {
} }
case TR::FloorData::TRIGGER : { case TR::FloorData::TRIGGER : {
if (info.trigCmdCount) break; bool skip = info.trigCmdCount > 0;
info.trigger = (TR::Level::Trigger::Type)cmd.sub;
info.trigCmdCount = 0; if (!skip) {
info.trigInfo = (*fd++).triggerInfo; info.trigger = (TR::Level::Trigger::Type)cmd.sub;
info.trigCmdCount = 0;
info.trigInfo = (*fd++).triggerInfo;
} else
fd++;
TR::FloorData::TriggerCommand trigCmd; TR::FloorData::TriggerCommand trigCmd;
do { do {
ASSERT(info.trigCmdCount < MAX_TRIGGER_COMMANDS);
trigCmd = (*fd++).triggerCmd; // trigger action trigCmd = (*fd++).triggerCmd; // trigger action
info.trigCmd[info.trigCmdCount++] = trigCmd; if (!skip) {
ASSERT(info.trigCmdCount < MAX_TRIGGER_COMMANDS);
info.trigCmd[info.trigCmdCount++] = trigCmd;
}
} while (!trigCmd.end); } while (!trigCmd.end);
break; break;
} }