From e9b0ca9a83f1dab48b3c5837e0602e0062b12e90 Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Mon, 30 Jan 2017 11:08:58 +0800 Subject: [PATCH] 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. --- similar/editor/eswitch.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/similar/editor/eswitch.cpp b/similar/editor/eswitch.cpp index bf13be675..e33628180 100644 --- a/similar/editor/eswitch.cpp +++ b/similar/editor/eswitch.cpp @@ -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; }