hmmm

diff --git a/HEAP.16W b/HEAP.16W
index 226750320ac33d3c09639e7105c0070624b43de7..e9f848902486f2c9fd2a8a4eec9deafd63baebfa 100755 (executable)
--- a/HEAP.16W
+++ b/HEAP.16W
@@ -1,47 +1,53 @@
 \r
        == near ==\r
 \r
-  USED block at 1d0d:f9a6 of size 12\r
-  USED block at 1d0d:f9b2 of size 320\r
-  USED block at 1d0d:faf2 of size 52\r
-  USED block at 1d0d:fb26 of size 20\r
-  USED block at 1d0d:fb3a of size 20\r
-  USED block at 1d0d:fb4e of size 20\r
-  USED block at 1d0d:fb62 of size 20\r
-  USED block at 1d0d:fb76 of size 20\r
-  FREE block at 1d0d:fb8a of size 1138\r
+  USED block at 1e7f:fa16 of size 12\r
+  USED block at 1e7f:fa22 of size 320\r
+  USED block at 1e7f:fb62 of size 52\r
+  USED block at 1e7f:fb96 of size 20\r
+  USED block at 1e7f:fbaa of size 20\r
+  USED block at 1e7f:fbbe of size 20\r
+  USED block at 1e7f:fbd2 of size 20\r
+  USED block at 1e7f:fbe6 of size 20\r
+  FREE block at 1e7f:fbfa of size 1026\r
 OK - end of heap\r
 \r
        == far ==\r
 \r
-  USED block at 2d0e:0016 of size 10246\r
-  USED block at 2d0e:281c of size 136\r
-  USED block at 2d0e:28a4 of size 66\r
-  USED block at 2d0e:28e6 of size 50\r
-  USED block at 2d0e:2918 of size 50\r
-  USED block at 2d0e:294a of size 50\r
-  USED block at 2d0e:297c of size 50\r
-  USED block at 2d0e:29ae of size 50\r
-  USED block at 2d0e:29e0 of size 50\r
-  USED block at 2d0e:2a12 of size 50\r
-  USED block at 2d0e:2a44 of size 50\r
-  USED block at 2d0e:2a76 of size 50\r
-  USED block at 2d0e:2aa8 of size 50\r
-  USED block at 2d0e:2ada of size 50\r
-  USED block at 2d0e:2b0c of size 50\r
-  USED block at 2d0e:2b3e of size 20\r
-  FREE block at 2d0e:2b52 of size 7370\r
-OK - end of heap\r
+  USED block at 2e80:0016 of size 4098\r
+  USED block at 2e80:1018 of size 20\r
+  USED block at 2e80:102c of size 66\r
+  USED block at 2e80:106e of size 50\r
+  USED block at 2e80:10a0 of size 50\r
+  USED block at 2e80:10d2 of size 50\r
+  USED block at 2e80:1104 of size 50\r
+  USED block at 2e80:1136 of size 50\r
+  USED block at 2e80:1168 of size 50\r
+  USED block at 2e80:119a of size 50\r
+  USED block at 2e80:11cc of size 50\r
+  USED block at 2e80:11fe of size 50\r
+  USED block at 2e80:1230 of size 50\r
+  USED block at 2e80:1262 of size 50\r
+  USED block at 2e80:1294 of size 50\r
+  FREE block at 2e80:12c6 of size 29552\r
+  USED block at 2e80:8636 of size 1202\r
+  USED block at 2e80:8ae8 of size 1202\r
+  USED block at 2e80:8f9a of size 1202\r
+  USED block at 2e80:944c of size 136\r
+  USED block at 2e80:94d4 of size 22\r
+  FREE block at 2e80:94ea of size 8202\r
+  FREE block at 2e80:b4f4 of size 0\r
+ERROR - bad node in heap\r
 \r
 Memory Type         Total      Used       Free\r
 ----------------  --------   --------   --------\r
-Near              1622         484       1138\r
-Far               18438        11068     7370\r
+Near              1510         484       1026\r
+Far               46302        8548      37754\r
 ----------------  --------   --------   --------\r
-HC_coreleft = 1136\r
-HC_farcoreleft = 450560\r
-HC_GetFreeSize = 7370\r
-HC_GetNearFreeSize = 1138\r
-HC_GetFarFreeSize = 7370\r
-memavl = 1136\r
+HC_coreleft = 1024\r
+HC_farcoreleft = 417792\r
+HC_GetFreeSize = 37754\r
+HC_GetNearFreeSize = 1026\r
+HC_GetFarFreeSize = 37754\r
+memavl = 1024\r
 stackavail = 31498\r

diff --git a/MMDUMP.16W b/MMDUMP.16W
index 1c61f4331acaabb8a4f75f9178df8fce26ecc8ed..117c7dc425cadc4527c2abc1bf2d6cbc65e98871 100755 (executable)
Binary files a/MMDUMP.16W and b/MMDUMP.16W differ

diff --git a/makefile b/makefile
index bc868580868d010449b7ba70c9c05526bee69492..8c815b01faab9fd0b2b97ec437f7357329e2fdaa 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -131,7 +131,7 @@ 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 -DSTACKSIZE=STKSIZ
+CPPFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 -DSTACKSIZE=$(STKSIZ)
 !ifeq DEBUGSERIAL 1
 CPPFLAGS += -DDEBUGSERIAL
 !endif
@@ -267,7 +267,7 @@ 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)                #bitmapl.$(OBJ)
+xcroll.exe:    xcroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)                bitmapl.$(OBJ)
 xcroll.$(OBJ): $(SRC)/xcroll.c
 zcroll.exe:    zcroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 zcroll.$(OBJ): $(SRC)/zcroll.c

diff --git a/src/xcroll.c b/src/xcroll.c
index efa76b750ec441f5d099d8226222657f8d381f03..480d517ed2f7872338e401c98aaaf9ef1c831f05 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -24,7 +24,8 @@
 #include "src/lib/16_timer.h"\r
 //#include "src/lib/16_dbg.h"\r
 \r
-#define FADE\r
+//#define FADE\r
+\r
 //#define NOMAPLOAD\r
 //#define OLDPLAYERSPRITESTUFF\r
 #ifdef __DEBUG__\r
@@ -337,6 +338,16 @@ void main(int argc, char *argv[])
 #endif\r
 }\r
 \r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
 #ifdef OLDPLAYERSPRITESTUFF\r
 void\r
 modexDrawSprite(page_t *page, int x, int y, bitmap_t *bmp) {\r