xcroll.exe needs through testing on real hardware./wbuild.sh; wmake www./wbuild.sh...

diff --git a/makefile b/makefile
index 1d8d592fd6ebcd333aba89bb0e0322f6aa8db84f..c14d93532fdba189e548517b6f63f811b82750fa 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -119,7 +119,7 @@ UPXQ=-qqq
 #
 # compile flags
 #
-S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k45056#32768#24576
+S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#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) 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) 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)
 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 ce68bda54e2829c1ff6ff53c303a139df2ab2521..8cb5a7089825febbd9712f3910359b2ee268bcaf 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -497,7 +497,7 @@ typedef struct
 //from 16_mm\r
 //==========================================================================\r
 \r
-#define MAXBLOCKS              256//800                //kd=1300 wolf3d=700 cata=600\r
+#define MAXBLOCKS              800             //kd=1300 wolf3d=700 cata=600\r
 \r
 typedef struct mmblockstruct\r
 {\r
@@ -762,7 +762,7 @@ typedef struct      //TODO: USE THIS!!!!
 #ifdef AUDIOHEADERLINKED\r
        huffnode        *audiohuffman;\r
 #else\r
-//     huffnode        audiohuffman[63];\r
+       huffnode        audiohuffman[63];\r
 #endif\r
 \r
        CASVT           chunkcomplen,chunkexplen;//long\r

diff --git a/src/xcroll.c b/src/xcroll.c
index 20a50904ea99b91b89bd141ef397925db7404baa..29ef17f4b7537423ab268f0c4bfab65e56d6b2f5 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -27,7 +27,7 @@
 //#define FADE\r
 //#define NOMAPLOAD\r
 \r
-#define VERBOSESCROLL\r
+//#define VERBOSESCROLL\r
 \r
 static map_t map;\r
 float t;\r