Browse Source

Cleanup more macro naming

master
cancel 6 years ago
parent
commit
7298dc56dd
  1. 8
      sim.c

8
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; bool const Oper_ports_enabled = Dual_is_active;
#define OPER_DUAL_REQUIRE_TRIGGER() \ #define DUAL_REQUIRE_TRIGGER \
if (!Dual_is_active) \ if (!Dual_is_active) \
return return
@ -186,7 +186,7 @@ static inline void oper_move_relative_or_explode(Gbuffer gbuf, Mbuffer mbuf,
BEGIN_DUAL_PHASE_0(_oper_name) \ BEGIN_DUAL_PHASE_0(_oper_name) \
BEGIN_HASTE \ BEGIN_HASTE \
REALIZE_DUAL; \ REALIZE_DUAL; \
OPER_DUAL_REQUIRE_TRIGGER(); \ DUAL_REQUIRE_TRIGGER; \
OPER_MOVE_OR_EXPLODE(_delta_y, _delta_x); \ OPER_MOVE_OR_EXPLODE(_delta_y, _delta_x); \
END_HASTE \ END_HASTE \
END_PHASE \ END_PHASE \
@ -225,7 +225,7 @@ BEGIN_DUAL_PHASE_0(add)
END_PHASE END_PHASE
BEGIN_DUAL_PHASE_1(add) BEGIN_DUAL_PHASE_1(add)
REALIZE_DUAL; REALIZE_DUAL;
OPER_DUAL_REQUIRE_TRIGGER(); DUAL_REQUIRE_TRIGGER;
Glyph inp0 = OPER_PEEK(0, 1); Glyph inp0 = OPER_PEEK(0, 1);
Glyph inp1 = OPER_PEEK(0, 2); Glyph inp1 = OPER_PEEK(0, 2);
Glyph g = glyphs_sum(inp0, inp1); Glyph g = glyphs_sum(inp0, inp1);
@ -242,7 +242,7 @@ BEGIN_DUAL_PHASE_0(modulo)
END_PHASE END_PHASE
BEGIN_DUAL_PHASE_1(modulo) BEGIN_DUAL_PHASE_1(modulo)
REALIZE_DUAL; REALIZE_DUAL;
OPER_DUAL_REQUIRE_TRIGGER(); DUAL_REQUIRE_TRIGGER;
Glyph inp0 = OPER_PEEK(0, 1); Glyph inp0 = OPER_PEEK(0, 1);
Glyph inp1 = OPER_PEEK(0, 2); Glyph inp1 = OPER_PEEK(0, 2);
Glyph g = glyphs_mod(inp0, inp1); Glyph g = glyphs_mod(inp0, inp1);

Loading…
Cancel
Save