map exits: Added required input field to exit struct

diff --git a/src/defs.s b/src/defs.s
index bbd17479f771e66d7e071b7b6fc40f9d0a4bb9cc..6744428121ef6df2e0afabca401b1519439f362f 100644 (file)
--- a/src/defs.s
+++ b/src/defs.s
@@ -301,6 +301,10 @@
   ; map exit table entry struct
 .se 0
 .de map_exit_flags, 1
+  ; if this is != 0
+  ; the exit will only trigger
+  ; if the input specified is pressed
+.de map_exit_required_input, 1
 .de map_exit_goto_y, 1
 .de map_exit_goto_x, 1
   ; pointer to new map struct

diff --git a/src/macros.inc b/src/macros.inc
index bc375194105586aa7caee95dcd02113aced913f8..7a714d2ee527d6e9dacb277106b6f89f362eed4d 100644 (file)
--- a/src/macros.inc
+++ b/src/macros.inc
@@ -278,14 +278,16 @@
   ; defines an exit table entry
   ; inputs:
   ;   $1: flags
-  ;   $2: goto y
-  ;   $3: goto x
-  ;   $4: map header pointer
+  ;   $2: required input/0
+  ;   $3: goto y
+  ;   $4: goto x
+  ;   $5: map header pointer
 #macro map_exit_table_entry
   .db $1
   .db $2
   .db $3
-  dw $4
+  .db $4
+  dw $5
 #endmacro
 
   ; loads NULL into a 16 bit register