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..1d8d592fd6ebcd333aba89bb0e0322f6aa8db84f 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -119,8 +119,8 @@ UPXQ=-qqq
 #
 # compile flags
 #
-S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#24576
-Z_FLAGS=-zk0 -zc -zm#### -zp4 -ei
+S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k45056#32768#24576
+Z_FLAGS=-zk0 -zc -zm -zp4 -ei
 O_FLAGS=-opnr -oe=24 -oil+ -outback -ohm
 T_FLAGS=-bt=dos -wx -m$(MEMORYMODE) -0 -fpi87 -d1 -fo=.$(OBJ)## -e=65536
 
@@ -139,7 +139,7 @@ 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)
+GFXLIBOBJS = 16_vl.$(OBJ) 16_vl_1.$(OBJ) 16_vl_2.$(OBJ) 16_vlpal.$(OBJ) 16text.$(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)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 !ifeq DEBUGSERIAL 1

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index a1a293925ace89e4aa60372dfbc3a557b6257e03..ce68bda54e2829c1ff6ff53c303a139df2ab2521 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -366,7 +366,7 @@ typedef struct
 //===================================//\r
 #define PALSIZE                        768     //vga\r
 #define NUMCHUNKS              416     //keen\r
-#define MAXSCANLINES   240     // size of ylookup table\r
+//#define MAXSCANLINES 240     // size of ylookup table\r
 \r
 #define MAXSHIFTS              4\r
 #define STARTSPRITES   0       //temp\r
@@ -400,7 +400,7 @@ typedef struct
        word    quadwh;                 //preproccessed quad size of tilewidth and tileheight\r
 } tile_dimention_t;\r
 \r
-#define MAXSCROLLEDGES 6\r
+#define MAXSCROLLEDGES 2\r
 typedef struct\r
 {\r
        unsigned        panx,pany;              // panning adjustments inside port in pixels\r
@@ -497,7 +497,7 @@ typedef struct
 //from 16_mm\r
 //==========================================================================\r
 \r
-#define MAXBLOCKS              800//kd=1300 wolf3d=700 cata=600\r
+#define MAXBLOCKS              256//800                //kd=1300 wolf3d=700 cata=600\r
 \r
 typedef struct mmblockstruct\r
 {\r
@@ -756,13 +756,13 @@ typedef struct    //TODO: USE THIS!!!!
 #ifdef GRHEADERLINKED\r
        huffnode        *grhuffman;\r
 #else\r
-       huffnode        grhuffman[255];\r
+       huffnode        grhuffman[63];\r
 #endif\r
 \r
 #ifdef AUDIOHEADERLINKED\r
        huffnode        *audiohuffman;\r
 #else\r
-       huffnode        audiohuffman[255];\r
+//     huffnode        audiohuffman[63];\r
 #endif\r
 \r
        CASVT           chunkcomplen,chunkexplen;//long\r

diff --git a/src/lib/doslib b/src/lib/doslib
index dac2cfe205617d6edcb6d483c23bc3d4254977d1..da8765d3e9a400fd02106d23b05462fdf38b777b 160000 (submodule)
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit dac2cfe205617d6edcb6d483c23bc3d4254977d1
+Subproject commit da8765d3e9a400fd02106d23b05462fdf38b777b