Don't decrement trigger in remove_trigger_num if it's trigger_none

Fixes a crash when loading a level with redundant triggers and editor enabled, e.g. Passion of Death.
This commit is contained in:
Chris Taylor 2017-01-30 11:08:58 +08:00
parent 28489e0770
commit e9b0ca9a83

View file

@ -245,7 +245,7 @@ int remove_trigger_num(int trigger_num)
auto &trigger = w->trigger;
if (trigger == trigger_num)
trigger = trigger_none; // a trigger can be shared by multiple walls
else if (trigger > trigger_num)
else if (trigger > trigger_num && trigger != trigger_none)
--trigger;
}