Move FarPtr to base.inc

I want to use it in some files that don't depend on the game struct.

Author: magical

Makefile

@@ -73,7 +73,7 @@ seg6.obj: constants.asm structs.asm variables.asm
 sound.obj: constants.asm variables.asm func.mac
 digits.obj: variables.asm func.mac
 
-$(OBJ): extern.inc windows.inc
+$(OBJ): base.inc extern.inc windows.inc
 
 variables.asm: data.bin genvars.sh Makefile
 	$(SHELL) genvars.sh >variables.asm

base.inc

@@ -0,0 +1,18 @@
+; base.inc - common definitions
+
+; Useful constants for dealing with far pointers.
+;
+; Declare far pointers as a dword and use these constants to access
+; the segment and offset parts.
+;
+;       mov bx,[GameStatePtr]
+;       mov dx,[bx+TrapListPtr+FarPtr.Off]
+;       mov ax,[bx+TrapListPtr+FarPtr.Seg]
+;
+
+STRUC FarPtr
+    .Off        resw 1  ; 0x0
+    .Seg        resw 1  ; 0x2
+ENDSTRUC
+
+; vim: syntax=nasm

logic.asm

@@ -2,6 +2,7 @@ SEGMENT CODE ; 3
 
 ; Game logic
 
+%include "base.inc"
 %include "constants.asm"
 %include "structs.asm"
 %include "variables.asm"

seg4.asm

@@ -2,6 +2,7 @@ SEGMENT CODE ; 4
 
 ; Functions for loading levels
 
+%include "base.inc"
 %include "constants.asm"
 %include "structs.asm"
 %include "variables.asm"

structs.asm

@@ -148,18 +148,4 @@ STRUC Slipper
     .isblock    resw 1  ; 0x9
 ENDSTRUC
 
-; Useful constants for dealing with far pointers.
-;
-; Declare far pointers as a dword and use these constants to access
-; the segment and offset parts.
-;
-;       mov bx,[GameStatePtr]
-;       mov dx,[bx+TrapListPtr+FarPtr.Off]
-;       mov ax,[bx+TrapListPtr+FarPtr.Seg]
-;
-STRUC FarPtr
-    .Off        resw 1  ; 0x0
-    .Seg        resw 1  ; 0x2
-ENDSTRUC
-
 ; vim: syntax=nasm