16_ca needs huge amounts of work and I should remember what needs to be done soon...

diff --git a/makefile b/makefile
index 5c21b2ad782cbf256212191df6b5a115e5543cae..c0ed9da852d9506140a947ce61d7b2d24dd40cd9 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -34,7 +34,7 @@
 # comment this out on game release.
 # serial output goes to COM1 at 9600 baud 1 stop bit odd parity.
 # serial output is plain text ASCII.
-DEBUGSERIAL=1
+DEBUGSERIAL=0
 
 DELLOGFILE=1
 
@@ -139,8 +139,10 @@ LIBFLAGS=$(WLIBQ) -b -n
 #
 VGMSNDOBJ = vgmSnd.$(OBJ)
 OLDLIBOBJS=bitmap.$(OBJ) 16render.$(OBJ)
-GFXLIBOBJS = 16_vl.$(OBJ) 16_vl_1.$(OBJ) 16_vl_2.$(OBJ) 16_vlpal.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16_vrs.$(OBJ) 16_spri.$(OBJ)
-16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_head.$(OBJ) 16_enti.$(OBJ) 16_dbg.$(OBJ) 16_in.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) 16_map.$(OBJ) 16text.$(OBJ) 16_sd.$(OBJ) 16_tail_.$(OBJ) 16_dbg_1.$(OBJ)
+GFXLIBCOREOBJS = 16_vl.$(OBJ) 16text.$(OBJ) scroll16.$(OBJ) 16_vrs.$(OBJ) 16_spri.$(OBJ) 16_vl_1.$(OBJ)        #bakapee.$(OBJ)
+GFXLIBOBJS = $(GFXLIBCOREOBJS) 16_vl_2.$(OBJ) 16_vlpal.$(OBJ)
+16LIBCOREOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_head.$(OBJ) 16_enti.$(OBJ) 16_dbg.$(OBJ) 16_in.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) 16_map.$(OBJ) 16_tail_.$(OBJ)
+16LIBOBJS = $(16LIBCOREOBJS) 16_sd.$(OBJ) 16_dbg_1.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 !ifeq DEBUGSERIAL 1
 DOSLIBOBJ += 8250.$(OBJ)
@@ -260,7 +262,8 @@ bakapi.exe:         bakapi.$(OBJ) 16_vl.$(OBJ) 16_vl_1.$(OBJ) 16text.$(OBJ) bakapee.$(O
 #
 scroll.exe:    scroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 scroll.$(OBJ): $(SRC)/scroll.c
-xcroll.exe:    xcroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
+#$(16LIB) gfx.lib
+xcroll.exe:    xcroll.$(OBJ) $(DOSLIB) $(16LIBCOREOBJS) $(GFXLIBCOREOBJS)
 xcroll.$(OBJ): $(SRC)/xcroll.c
 zcroll.exe:    zcroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 zcroll.$(OBJ): $(SRC)/zcroll.c

diff --git a/src/lib/16_dbg.h b/src/lib/16_dbg.h
index 3322046c9b0ae1901f77cda3ee2d714dc6edb273..c6554cbf5e78fb4e117b81727281a11cfb70795a 100755 (executable)
--- a/src/lib/16_dbg.h
+++ b/src/lib/16_dbg.h
@@ -6,7 +6,9 @@
 #include "src/lib/16_pm.h"\r
 #include "src/lib/16_tdef.h"\r
 \r
-#define __DEBUG__\r
+//#define __DEBUG__\r
+\r
+#ifdef __DEBUG__\r
 //#define __DEBUG_InputMgr__\r
 #define __DEBUG_MAP__\r
 //#define __DEBUG_2__\r
@@ -16,6 +18,7 @@
 //#define __DEBUG_RF__\r
 #define __DEBUG_SPRI__\r
 #define __DEBUG_VL__\r
+#endif\r
 \r
 \r
 #ifdef __DEBUG__\r

diff --git a/src/lib/16_head.c b/src/lib/16_head.c
index 8786a9fd3787f7054175153bb5fd4147139a78c2..9862dd73a4e85bf222f5d1afc84a2ae81b40d995 100755 (executable)
--- a/src/lib/16_head.c
+++ b/src/lib/16_head.c
@@ -22,6 +22,9 @@
 \r
 #include "src/lib/16_head.h"\r
 \r
+char global_temp_status_text[512];\r
+char global_temp_status_text2[512];\r
+\r
 long int\r
 filesize(FILE *fp)\r
 {\r

diff --git a/src/lib/16_map.c b/src/lib/16_map.c
index 6bd66ccf5ddfb716474223787190f2e02226fe8a..ad846e81b10bae5149e44ea7effc21606343781a 100755 (executable)
--- a/src/lib/16_map.c
+++ b/src/lib/16_map.c
@@ -242,10 +242,8 @@ int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar)
        else if(status != tokcount) { printf("Warning: used %d tok\n", status);}\r
        extract_map((char const *)MAPSEGINLM, tok, tokcount, map);\r
 \r
-       printf("freeing tok\n");\r
        free(tok);      //TODO: USE MM_ CA_ AND PM_\r
-//     printf("fclose fh\n");\r
-//     fclose(fh);     //TODO: USE MM_ CA_ AND PM_\r
+       fclose(fh);     //TODO: USE MM_ CA_ AND PM_\r
 \r
        return 0;\r
 }\r

diff --git a/src/lib/16_spri.c b/src/lib/16_spri.c
index 502ed4a43a29a119b029d30329aed83aabf67eef..aaeda8fc98ce29401c4fca1be579e9b6c2d032b4 100755 (executable)
--- a/src/lib/16_spri.c
+++ b/src/lib/16_spri.c
@@ -159,7 +159,9 @@ void animate_spri(entity_t *enti, video_t *video)
 #define INC_PER_FRAME if(enti->q&1) enti->persist_aniframe++; if(enti->persist_aniframe>4) enti->persist_aniframe = 1;\r
        unsigned int i,o,o2; int j;\r
        int x,y,rx,ry,w,h;\r
+#ifdef __DEBUG_SPRI__\r
        static struct glob_game_vars *ggvv;\r
+#endif\r
        VGA_RAM_PTR omemptr = (VGA_RAM_PTR)video->page[0].data;// save original mem ptr\r
 \r
        x=enti->spri.x;\r

diff --git a/src/lib/16_tail.h b/src/lib/16_tail.h
index d106d0ef1b3b05d24c31129bb3222ef88863a6e4..60f919e2215a1d8fcf76b99020ae65660c3014b5 100755 (executable)
--- a/src/lib/16_tail.h
+++ b/src/lib/16_tail.h
@@ -82,13 +82,13 @@
        if(gvar.in.inst->Keyboard[sc_F6]){ ZC_ShowMV(&gvar.mv, 0, 0);                                           IN_UserInput(1, &gvar); } \\r
        if(gvar.in.inst->Keyboard[sc_T]){ gvar.video.vga_state.rss=!gvar.video.vga_state.rss;                   IN_UserInput(1, &gvar); } \\r
        if(gvar.in.inst->Keyboard[sc_P]){ modexpdump(0, &gvar);                                                 IN_UserInput(1, &gvar); } \\r
-       if(gvar.in.inst->Keyboard[sc_Y]){ dbg_delayanimation=!dbg_delayanimation;                               IN_UserInput(1, &gvar); } \\r
-       if(gvar.in.inst->Keyboard[sc_Q]){ VL_modexPrintTextBox(&gvar);                                          IN_UserInput(1, &gvar); } \\r
        if(gvar.in.inst->Keyboard[sc_W]){ VL_MemToScreen((byte __far *)&gvar, 64, 64, 16, 16, &gvar);   IN_UserInput(1, &gvar); } \\r
-       if(gvar.in.inst->Keyboard[sc_LBrkt]){ ShowPalVal (&gvar);                                                       IN_UserInput(1, &gvar); } \\r
        if(gvar.in.inst->Keyboard[sc_M]){ MM_ShowMemory(&gvar);                                                 IN_UserInput(1, &gvar); } \\r
        RFDEBUGFUNCTIONS\r
 //FIZZLEFADEFUNCTION\r
+       //if(gvar.in.inst->Keyboard[sc_Y]){ dbg_delayanimation=!dbg_delayanimation;                             IN_UserInput(1, &gvar); }\r
+       //if(gvar.in.inst->Keyboard[sc_LBrkt]){ ShowPalVal (&gvar);                                                     IN_UserInput(1, &gvar); }\r
+       //if(gvar.in.inst->Keyboard[sc_Q]){ VL_modexPrintTextBox(&gvar);                                                IN_UserInput(1, &gvar); }\r
 \r
 #define TAIL_PANKEYFUN \\r
        TAIL_PANKEYFUNZC \\r
@@ -115,13 +115,14 @@
        if(gvar.in.inst->Keyboard[sc_X]){ TESTBG12 } \\r
        if(gvar.in.inst->Keyboard[sc_C]){ TESTBG34 } \\r
        if(gvar.in.inst->Keyboard[sc_V]){ VL_PatternDraw(&gvar.video, 0, 1, 1); } \\r
-       if(gvar.in.inst->Keyboard[sc_I]){ dbg_maptext=!dbg_maptext; IN_UserInput(1, &gvar); } \\r
        if(gvar.in.inst->Keyboard[sc_PgDn]){ \\r
                rotateR(gvar.video.palette, sizeof(gvar.video.palette)/sizeof(gvar.video.palette[0])); \\r
                VL_UpdatePaletteWrite(&gvar.video.palette, 0, &gvar);           IN_UserInput(1, &gvar); } \\r
        if(gvar.in.inst->Keyboard[sc_PgUp]){ \\r
                rotateL(gvar.video.palette, sizeof(gvar.video.palette)/sizeof(gvar.video.palette[0])); \\r
                VL_UpdatePaletteWrite(&gvar.video.palette, 0, &gvar);           IN_UserInput(1, &gvar); }\r
+//     if(gvar.in.inst->Keyboard[sc_I]){ dbg_maptext=!dbg_maptext; IN_UserInput(1, &gvar); }\r
+\r
 #ifdef __BORLANDC__\r
 #define PAL_WRITE_REG             0x03C8   /* Color register, write address */\r
 #define PAL_DATA_REG                   0x03C9   /* Color register, data port */\r

diff --git a/src/lib/bakapee.c b/src/lib/bakapee.c
index 52786282e35aa8106c33b919b4abfa5b6af8b871..ff3888537ad1aefea41ac1f8a5921c37e91a24bd 100755 (executable)
--- a/src/lib/bakapee.c
+++ b/src/lib/bakapee.c
@@ -23,8 +23,6 @@
 #include "src/lib/bakapee.h"\r
 \r
 //static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */\r
-char global_temp_status_text[512];\r
-char global_temp_status_text2[512];\r
 \r
 //==========================================================================\r
 \r