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

diff --git a/exmmtest.upx b/exmmtest.upx
deleted file mode 100755 (executable)
index 5f0670c..0000000
Binary files a/exmmtest.upx and /dev/null differ

diff --git a/makefile b/makefile
index 383b14b8a0724f8542d834e7a22354505d0674b8..6d6b065a78d66cdb8bc87066bba533510798f7f6 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -116,16 +116,22 @@ WLIBQ=-q
 WCLQ=-zq
 UPXQ=-qqq
 
+#
+# stacksize
+#
+STKSIZ=32768
+#24576#40960
+
 #
 # compile flags
 #
-S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k24576#32768#40960
+S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k$(STKSIZ)
 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
 
 DBUGFLAGS=-fm=$^&.meh -fd=$^&
-CPPFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1
+CPPFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 -DSTACKSIZE=STKSIZ
 !ifeq DEBUGSERIAL 1
 CPPFLAGS += -DDEBUGSERIAL
 !endif

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index e400adc1051a94fa36cf6dbb7926c41fb81f84dc..5061b4d50fc8eab9d2850d4fa7b52097d929bd92 100755 (executable)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -824,6 +824,10 @@ void MM_Startup (global_game_variables_t *gvar)
        if(gvar->mm.mmstarted)\r
                MM_Shutdown (gvar);\r
 \r
+       //has to be 16\r
+       if(sizeof(mmblocktype)!=16)\r
+               return;\r
+\r
        gvar->mm.mmstarted = true;\r
        gvar->mm.bombonerror = true;\r
 //\r

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

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 48eecf8914b329fef745638ccf401ad4b27c3f60..8bcc3e8d112d87babd8f55996cef9c5c274d744b 100755 (executable)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -80,7 +80,9 @@
 //printf("middle tile position: %dx", gvar.video.page[0].tilemidposscreenx);   printf("%d\n", gvar.video.page[0].tilemidposscreeny);\r
 //printf("     aniframe=%u", gvar.player[0].enti.persist_aniframe);\r
 //printf("mv[0]txy: %dx%d      ", mv[0].tx, mv[0].ty); printf("mv[1]txy: %dx%d", mv[1].tx, mv[1].ty);\r
-#define SCROLLEXITMESG         printf("page[0]dxy: %dx%d", gvar.video.page[0].dx, gvar.video.page[0].dy);\\r
+//     printf("page[0]dxy: %dx%d", gvar.video.page[0].dx, gvar.video.page[0].dy);\r
+#define SCROLLEXITMESG \\r
+       printf("size of mmblocktype: %u ", sizeof(mmblocktype));\\r
        printf("\n\n");\\r
        printf("player vars:\n");\\r
        printf("        xy: %dx%d", gvar.player[0].enti.x, gvar.player[0].enti.y); printf("     txy: %dx%d", gvar.player[0].enti.tx, gvar.player[0].enti.ty); printf("  triggxy: %dx%d", gvar.player[0].enti.triggerx, gvar.player[0].enti.triggery); printf("  value: %d\n", gvar.mv[1].map->layerdata[0].data[(gvar.player[0].enti.triggerx-1)+(map.width*(gvar.player[0].enti.triggery-1))]);\\r