fix EVENT_CUSTOM (#355)

a04e2da1 · mercury233 · GitHub · 3da4f3b9 · a04e2da1
Commit a04e2da1 authored Jan 28, 2021 by mercury233 Committed by GitHub Jan 28, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

processor.cpp processor.cpp +1 -1

No files found.
--- a/processor.cpp
+++ b/processor.cpp
@@ -1820,7 +1820,7 @@ int32 field::process_instant_event() {
 				}
 			}
 		}
-		if(ev.event_code == EVENT_ADJUST || ev.event_code == EVENT_BREAK_EFFECT || ((ev.event_code & 0xf000) == EVENT_PHASE_START))
+		if(ev.event_code == EVENT_ADJUST || ev.event_code == EVENT_BREAK_EFFECT || ((ev.event_code & 0xf000) == EVENT_PHASE_START) && ((ev.event_code & EVENT_CUSTOM) == 0))
 			continue;
 		//triggers
 		pr = effects.trigger_f_effect.equal_range(ev.event_code);