From 7298dc56dd2c22690288ba0facf94a8391888e4a Mon Sep 17 00:00:00 2001 From: cancel Date: Tue, 27 Nov 2018 13:02:35 +0900 Subject: [PATCH] Cleanup more macro naming --- sim.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sim.c b/sim.c index 34d4a8b..cc96e79 100644 --- a/sim.c +++ b/sim.c @@ -153,7 +153,7 @@ static inline void oper_move_relative_or_explode(Gbuffer gbuf, Mbuffer mbuf, { \ bool const Oper_ports_enabled = Dual_is_active; -#define OPER_DUAL_REQUIRE_TRIGGER() \ +#define DUAL_REQUIRE_TRIGGER \ if (!Dual_is_active) \ return @@ -186,7 +186,7 @@ static inline void oper_move_relative_or_explode(Gbuffer gbuf, Mbuffer mbuf, BEGIN_DUAL_PHASE_0(_oper_name) \ BEGIN_HASTE \ REALIZE_DUAL; \ - OPER_DUAL_REQUIRE_TRIGGER(); \ + DUAL_REQUIRE_TRIGGER; \ OPER_MOVE_OR_EXPLODE(_delta_y, _delta_x); \ END_HASTE \ END_PHASE \ @@ -225,7 +225,7 @@ BEGIN_DUAL_PHASE_0(add) END_PHASE BEGIN_DUAL_PHASE_1(add) REALIZE_DUAL; - OPER_DUAL_REQUIRE_TRIGGER(); + DUAL_REQUIRE_TRIGGER; Glyph inp0 = OPER_PEEK(0, 1); Glyph inp1 = OPER_PEEK(0, 2); Glyph g = glyphs_sum(inp0, inp1); @@ -242,7 +242,7 @@ BEGIN_DUAL_PHASE_0(modulo) END_PHASE BEGIN_DUAL_PHASE_1(modulo) REALIZE_DUAL; - OPER_DUAL_REQUIRE_TRIGGER(); + DUAL_REQUIRE_TRIGGER; Glyph inp0 = OPER_PEEK(0, 1); Glyph inp1 = OPER_PEEK(0, 2); Glyph g = glyphs_mod(inp0, inp1);