QAOPM versions for ZX81

Fabrizio-Caruso · Oct 12, 2019 · 1186942 · 1186942
1 parent 96eb20f
commit 1186942
Show file tree

Hide file tree

Showing 3 changed files with 177 additions and 9 deletions.
diff --git a/src/Makefile b/src/Makefile
@@ -1443,6 +1443,23 @@ zx80_16k_turn_based:
 	rm $(BUILD_PATH)/FULL_zx80_16k_turn_based.prg
 
 
+zx80_16k_turn_based_qaopm:
+	$(Z88DK_PATH)$(MYZ88DK) +zx80 $(SCCZ80_OPTS) -vn \
+	-D__ZX80__ -DFULL_GAME \
+	-DZ88DK_JOYSTICK \
+	-DEND_SCREEN \
+	-DTURN_BASED \
+	-DALT_SLEEP \
+	-DCONIO \
+	-DNO_INIT_GRAPHICS \
+	-lndos \
+	-create-app -o  $(BUILD_PATH)/FULL_zx80_16k_turn_based_qaopm.prg \
+	$(CROSS_LIB_PATH)/sleep/sleep_macros.c \
+	$(SOURCE_PATH)/end_screen.c \
+	$(FULL_FILES)
+	rm $(BUILD_PATH)/FULL_zx80_16k_turn_based_qaopm.prg
+
+
 zx81_16k_turn_based:
 	$(Z88DK_PATH)$(MYZ88DK) +zx81 \
 	-compiler=sdcc \
@@ -1457,6 +1474,21 @@ zx81_16k_turn_based:
 	$(FULL_FILES)
 	rm $(BUILD_PATH)/FULL_zx81_16k_turn_based.prg
 
+
+zx81_16k_turn_based_qaopm:
+	$(Z88DK_PATH)$(MYZ88DK) +zx81 \
+	-compiler=sdcc \
+	$(ZSDCC_OPTS) \
+	-v \
+	-D__ZX81__ -DFULL_GAME -DEND_SCREEN -DBETWEEN_LEVEL \
+	-DZ88DK_JOYSTICK \
+	-DTURN_BASED \
+	-DCONIO -DNO_INIT_GRAPHICS \
+	-lndos \
+	-create-app -o  $(BUILD_PATH)/FULL_zx81_16k_turn_based_qaopm.prg \
+	$(SOURCE_PATH)/end_screen.c \
+	$(FULL_FILES)
+	rm $(BUILD_PATH)/FULL_zx81_16k_turn_based_qaopm.prg
 
 zx81_16k:
 	$(Z88DK_PATH)$(MYZ88DK) +zx81 \
@@ -1473,6 +1505,22 @@ zx81_16k:
 	$(FULL_FILES)
 	rm $(BUILD_PATH)/FULL_zx81_16k.prg
 
+
+zx81_16k_qaopm:
+	$(Z88DK_PATH)$(MYZ88DK) +zx81 \
+	$(ZSDCC_OPTS) \
+	-compiler=sdcc \
+	--opt-code-size \
+	-vn \
+	-D__ZX81__ -DFULL_GAME \
+	-DZ88DK_JOYSTICK \
+	-DEND_SCREEN -DBETWEEN_LEVEL \
+	-DCONIO -DNO_INIT_GRAPHICS \
+	-lndos \
+	-create-app -o  $(BUILD_PATH)/FULL_zx81_16k_qaopm.prg \
+	$(SOURCE_PATH)/end_screen.c \
+	$(FULL_FILES)
+	rm $(BUILD_PATH)/FULL_zx81_16k_qaopm.prg
 
 zx81_16k_wrx_no_text:
 	$(Z88DK_PATH)$(MYZ88DK) +zx81 -subtype=wrx -clib=wrx \
@@ -1495,6 +1543,7 @@ zx81_16k_wrx:
 	$(Z88DK_PATH)$(MYZ88DK) +zx81 -subtype=wrx -clib=wrx \
 	$(SCCZ80_OPTS) -O3 \
 	-pragma-include:$(CFG_PATH)/z88dk/zpragma_clib_no_printf.inc \
+	-DALT_MODE \
 	-DANIMATE_PLAYER \
 	-DFORCE_GHOSTS_NUMBER=7 \
 	-DFORCE_XSIZE=36 \
@@ -1508,7 +1557,6 @@ zx81_16k_wrx:
 	-DLESS_TEXT \
 	-DNO_COLOR \
 	-DSIMPLE_STRATEGY \
-	-DALT_MOVE \
 	-DNO_SET_SCREEN_COLORS \
 	-DALT_PRINT \
 	-DFEWER_SPRITES \
@@ -1520,6 +1568,36 @@ zx81_16k_wrx:
 	rm $(BUILD_PATH)/LIGHT_zx81_16k_wrx.prg
 
 
+zx81_16k_wrx_qaopm:
+	$(Z88DK_PATH)$(MYZ88DK) +zx81 -subtype=wrx -clib=wrx \
+	$(SCCZ80_OPTS) -O3 \
+	-pragma-include:$(CFG_PATH)/z88dk/zpragma_clib_no_printf.inc \
+	-DZ88DK_JOYSTICK \
+	-DANIMATE_PLAYER \
+	-DFORCE_GHOSTS_NUMBER=7 \
+	-DFORCE_XSIZE=36 \
+	-DFORCE_YSIZE=35 \
+	-vn \
+	-D__ZX81__ \
+	-DZ88DK_SPRITES \
+	-DLESS_PRINT \
+	-lndos \
+	-DANIMATE_PLAYER \
+	-DLESS_TEXT \
+	-DNO_COLOR \
+	-DSIMPLE_STRATEGY \
+	-DNO_SET_SCREEN_COLORS \
+	-DALT_PRINT \
+	-DFEWER_SPRITES \
+	-DNO_SMALL_LETTERS \
+	-create-app -o  $(BUILD_PATH)/LIGHT_zx81_16k_wrx_qaopm.prg \
+	$(LIGHT_FILES) \
+	$(CROSS_LIB_PATH)/display/init_graphics/z88dk/zx81/zx81_init_graphics.c \
+	$(CROSS_LIB_PATH)/display/alt_print/memory_mapped_alt_print.c
+	rm $(BUILD_PATH)/LIGHT_zx81_16k_wrx_qaopm.prg
+
+
+
 zx81_32k_wrx:
 	$(Z88DK_PATH)$(MYZ88DK) +zx81 -subtype=wrx -clib=wrx \
 	$(SCCZ80_OPTS) -O3 \
@@ -1550,6 +1628,37 @@ zx81_32k_wrx:
 	$(CROSS_LIB_PATH)/display/alt_print/memory_mapped_alt_print.c
 	rm $(BUILD_PATH)/FULL_zx81_32k_wrx.prg
 
+zx81_32k_wrx_qaopm:
+	$(Z88DK_PATH)$(MYZ88DK) +zx81 -subtype=wrx -clib=wrx \
+	$(SCCZ80_OPTS) -O3 \
+	-pragma-include:$(CFG_PATH)/z88dk/zpragma_clib_no_printf.inc \
+	-pragma-define:hrgpage=36096 \
+	-DFORCE_GHOSTS_NUMBER=7 \
+	-DANIMATE_PLAYER \
+	-DFORCE_XSIZE=36 \
+	-DFORCE_YSIZE=35 \
+	-DZ88DK_JOYSTICK \
+	-vn \
+	-D__ZX81__ \
+	-DZ88DK_SPRITES \
+	-DLESS_PRINT \
+	-DFULL_GAME \
+	-lndos \
+	-DANIMATE_PLAYER \
+	-DLESS_TEXT \
+	-DNO_COLOR \
+	-DSIMPLE_STRATEGY \
+	-DNO_SET_SCREEN_COLORS \
+	-DALT_PRINT \
+	-DFEWER_SPRITES \
+	-DNO_SMALL_LETTERS \
+	-create-app -o  $(BUILD_PATH)/FULL_zx81_32k_wrx_qaopm.prg \
+	$(FULL_FILES) \
+	$(CROSS_LIB_PATH)/display/init_graphics/z88dk/zx81/zx81_init_graphics.c \
+	$(CROSS_LIB_PATH)/display/alt_print/memory_mapped_alt_print.c
+	rm $(BUILD_PATH)/FULL_zx81_32k_wrx_qaopm.prg
+
+
 zx81_32k_wrx_turn_based:
 	$(Z88DK_PATH)$(MYZ88DK) +zx81 -subtype=wrx -clib=wrx \
 	$(SCCZ80_OPTS) -O3 \
@@ -1581,6 +1690,39 @@ zx81_32k_wrx_turn_based:
 	$(CROSS_LIB_PATH)/display/alt_print/memory_mapped_alt_print.c
 	rm $(BUILD_PATH)/FULL_zx81_32k_wrx_turn_based.prg
 
+
+zx81_32k_wrx_turn_based_qaopm:
+	$(Z88DK_PATH)$(MYZ88DK) +zx81 -subtype=wrx -clib=wrx \
+	$(SCCZ80_OPTS) -O3 \
+	-pragma-include:$(CFG_PATH)/z88dk/zpragma_clib_no_printf.inc \
+	-pragma-define:hrgpage=36096 \
+	-DZ88DK_JOYSTICK \
+	-DFORCE_GHOSTS_NUMBER=9 \
+	-DANIMATE_PLAYER \
+	-DNO_BLINKING \
+	-DTURN_BASED \
+	-DFORCE_XSIZE=36 \
+	-DFORCE_YSIZE=35 \
+	-vn \
+	-D__ZX81__ \
+	-DZ88DK_SPRITES \
+	-DLESS_PRINT \
+	-DFULL_GAME \
+	-lndos \
+	-DANIMATE_PLAYER \
+	-DLESS_TEXT \
+	-DNO_COLOR \
+	-DSIMPLE_STRATEGY \
+	-DNO_SET_SCREEN_COLORS \
+	-DALT_PRINT \
+	-DFEWER_SPRITES \
+	-DNO_SMALL_LETTERS \
+	-create-app -o  $(BUILD_PATH)/FULL_zx81_32k_wrx_turn_based_qaopm.prg \
+	$(FULL_FILES) \
+	$(CROSS_LIB_PATH)/display/init_graphics/z88dk/zx81/zx81_init_graphics.c \
+	$(CROSS_LIB_PATH)/display/alt_print/memory_mapped_alt_print.c
+	rm $(BUILD_PATH)/FULL_zx81_32k_wrx_turn_based_qaopm.prg
+
 zx81_wrx_targets: \
     zx81_16k_wrx zx81_32k_wrx zx81_32k_wrx_turn_based
 
@@ -5770,8 +5912,14 @@ gal_targets: \
 zx80_targets: \
 	zx80_16k_turn_based
 
-zx81_targets: \
+zx81_targets_ijkl_spc: \
 	zx81_16k zx81_16k_turn_based zx81_16k_wrx zx81_32k_wrx zx81_32k_wrx_turn_based
+
+zx81_targets_qaopm: \
+	zx81_16k_qaopm zx81_16k_turn_based_qaopm zx81_16k_wrx_qaopm zx81_32k_wrx_qaopm zx81_32k_wrx_turn_based_qaopm
+
+zx81_targets: \
+    zx81_targets_qaopm
 
 spectrum_targets: \
 	spectrum_16k spectrum_48k

diff --git a/src/chase/text_strings.h b/src/chase/text_strings.h
@@ -116,10 +116,18 @@
 	#else
 		#define USE_STRING "use i j k l space"	
 	#endif	
+#elif defined(NO_SMALL_LETTERS) 
+	#if defined(JOYSTICK_CONTROL)
+		#define USE_STRING "USE THE JOYSTICK"
+	#elif defined(TINY_GAME) 
+		#define USE_STRING "USE IJKL"
+	#elif XSize<=16
+		#define USE_STRING "USE IJKL SPACE"	
+	#else
+		#define USE_STRING "USE I J K L SPACE"	
+	#endif	
 #else
-    #if defined(NO_SMALL_LETTERS) 
-        #define USE_STRING "USE IJKL SPACE"
-	#elif defined(JOYSTICK_CONTROL)
+	#if defined(JOYSTICK_CONTROL)
 		#define USE_STRING "Use the joystick"
 	#elif defined(TINY_GAME) 
 		#define USE_STRING "Use IJKL"
@@ -130,6 +138,11 @@
 	#endif	
 #endif
 
+#if (defined(__ZX81__) || defined(__ZX80__)) && defined(JOYSTICK_CONTROL)
+    #undef USE_STRING
+    #define USE_STRING "USE Q A O P M"
+#endif    
+
 #if defined(NO_SMALL_LETTERS)
     #define TITLE_LINE_STRING "CROSS CHASE"
 #else

diff --git a/src/cross_lib/input/input_macros.h b/src/cross_lib/input/input_macros.h
@@ -48,10 +48,17 @@
 	#elif defined(Z88DK_JOYSTICK)
 		extern unsigned char stick;
 
-		#define INIT_INPUT() \
-		{ \
-			stick = 1; \
-		}
+        #if !defined(__ZX81__)
+            #define INIT_INPUT() \
+            { \
+                stick = 1; \
+            }
+        #else
+            #define INIT_INPUT() \
+            { \
+                stick = 3; \
+            }            
+        #endif
 	#elif defined(__SMS__)
 		#define INIT_INPUT()
 	#else // All CBM except CBM610 + ATARI + ATARI XL + ATARI 5200