i think this may work now wwww

	modified:   16.exe
	modified:   DEBUG.16W
	modified:   HEAP.16W
	modified:   MMDUMP.16W
	modified:   bakapi.exe
	modified:   bcexmm.prj
	modified:   exmmtest.exe
	modified:   exmmtest.map
	modified:   fmemtest.exe
	modified:   fontgfx.exe
	modified:   fonttest.exe
	modified:   inputest.exe
	modified:   makefile
	modified:   maptest.exe
	modified:   palettec.exe
	modified:   pcxtest.exe
	modified:   scroll.exe
	modified:   src/lib/scroll16.c
	modified:   src/lib/scroll16.h
	modified:   src/scroll.c
	modified:   test.exe
	modified:   test2.exe
	modified:   vgmtest.exe

diff --git a/16.exe b/16.exe
index f209afe55a5e858d8217a8488c7008509a8e893b..f0ad88163c2ab674bfa632953dcb239f433480b4 100755 (executable)
Binary files a/16.exe and b/16.exe differ

diff --git a/DEBUG.16W b/DEBUG.16W
index 3d63e4ce1c7cfd38628e8e26503b1827525ffb26..e1f47b45a501e316a0b7c5102efbe2463aa9415a 100755 (executable)
--- a/DEBUG.16W
+++ b/DEBUG.16W
@@ -1,15 +1,15 @@
-\e[0mSeg:0      Size:6855       Owner:0x6c63\r
-\e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m\r
-\e[42;32m0000\r
-\e[0m\e[0mSeg:1b88       Size:40 Owner:0x0\r
-\e[41;31m+\e[0m\e[47;37m_\e[0m\r
+\e[0mSeg:0      Size:6305       Owner:0x0\r
+\e[41;31m+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m\r
+\e[42;32m0\r
+\e[0m\e[0mSeg:18a1       Size:256        Owner:0x8d1c\r
+\e[44;34m+++++\e[0m\e[47;37m_\e[0m\r
 \e[42;32m\r
-\e[0m\e[0mSeg:1bb0       Size:256        Owner:0xaf7c\r
+\e[0m\e[0mSeg:19a1       Size:273        Owner:0xcd8c\r
 \e[44;34m++++\e[0m\e[47;37m_\e[0m\r
 \e[42;32m\r
-\e[0m\e[0mSeg:1cb0       Size:273        Owner:0xefec\r
-\e[44;34m+++++\e[0m\e[47;37m_\e[0m\r
-\e[42;32m000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\r
+\e[0m\e[0mSeg:1b88       Size:40 Owner:0x0\r
+\e[41;31m+\e[0m\e[47;37m_\e[0m\r
+\e[42;32m00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\r
 \e[0m\e[0mSeg:abb0       Size:13392      Owner:0x0\r
 \e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[47;37m_\e[0m\r
 \e[42;32m\r

diff --git a/HEAP.16W b/HEAP.16W
index 60b00efce191656fae2c86ccae52e042078188df..c554a6422103712650f8ac3f073f8126c9b34528 100755 (executable)
--- a/HEAP.16W
+++ b/HEAP.16W
@@ -10,15 +10,15 @@ OK - end of heap
 \r
        == near ==\r
 \r
-  USED block at ba9f016 of size 12\r
-  USED block at ba9f022 of size 294\r
-  USED block at ba9f148 of size 42\r
-  USED block at ba9f172 of size 20\r
-  USED block at ba9f186 of size 20\r
-  USED block at ba9f19a of size 20\r
-  USED block at ba9f1ae of size 20\r
-  USED block at ba9f1c2 of size 20\r
-  USED block at ba9f1d6 of size 3622\r
+  USED block at ba9cdb6 of size 12\r
+  USED block at ba9cdc2 of size 294\r
+  USED block at ba9cee8 of size 42\r
+  USED block at ba9cf12 of size 20\r
+  USED block at ba9cf26 of size 20\r
+  USED block at ba9cf3a of size 20\r
+  USED block at ba9cf4e of size 20\r
+  USED block at ba9cf62 of size 20\r
+  USED block at ba9cf76 of size 12422\r
 OK - end of heap\r
 \r
        == far ==\r
@@ -33,13 +33,13 @@ OK - end of heap
 Memory Type         Total      Used       Free\r
 ----------------  --------   --------   --------\r
 Default                   8166         222       7944\r
-Near              4070         448       3622\r
+Near              12870        448       12422\r
 Far               8166         222       7944\r
 ----------------  --------   --------   --------\r
-coreleft = 3620\r
-farcoreleft = 19560\r
+coreleft = 12420\r
+farcoreleft = 28360\r
 GetFreeSize = 15960\r
-GetNearFreeSize = 3622\r
+GetNearFreeSize = 12422\r
 GetFarFreeSize = 15960\r
-memavl = 3620\r
-stackavail = 42358\r
+memavl = 12420\r
+stackavail = 33558\r

diff --git a/MMDUMP.16W b/MMDUMP.16W
index 30b072b875fa0242773c981f6bd38a8b67898308..3ba611a41d0c318a8c2f63c3b4899a7c610d6df8 100755 (executable)
Binary files a/MMDUMP.16W and b/MMDUMP.16W differ

diff --git a/bakapi.exe b/bakapi.exe
index 87a1e2fb8c867fa7e406a37154b28ed7f49d3b11..6701796c50768893ed117d6a57f5f13171139b37 100755 (executable)
Binary files a/bakapi.exe and b/bakapi.exe differ

diff --git a/bcexmm.prj b/bcexmm.prj
index 0954906619e9d4b6fddd3ace6c9b2056a45b343b..7062260a59cba9d2581ab89a6405c26f0d1e10d0 100755 (executable)
Binary files a/bcexmm.prj and b/bcexmm.prj differ

diff --git a/exmmtest.exe b/exmmtest.exe
index 1543a68981b370d9334d02534e7571b0b2a9ac8b..9013501f50ad5de14ca3e42e085e33e6905610b0 100755 (executable)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/exmmtest.map b/exmmtest.map
index edb26c8df2a3823dd1e3899be373a6fba205d3ac..26cf924351f2b1405aea763aace9e1aef2ba72a2 100755 (executable)
--- a/exmmtest.map
+++ b/exmmtest.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 14 2015 12:40:28 (32-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/09/15 11:25:52
+Created on:       15/09/15 14:51:44
 Executable Image: exmmtest.exe
 creating a DOS executable
 
@@ -13,7 +13,7 @@ creating a DOS executable
 Group                           Address              Size
 =====                           =======              ====
 
-DGROUP                          098e:0000            0000f000
+DGROUP                          098e:0000            0000cda0
 
 
 
@@ -41,7 +41,7 @@ YIE                    DATA           DGROUP         09d1:000c       00000000
 STRINGS                DATA           DGROUP         09d1:000c       00000000
 DATA                   DATA           DGROUP         09d1:000c       00000000
 _BSS                   BSS            DGROUP         09d2:0000       00000153
-STACK                  STACK          DGROUP         09e8:0000       0000ea60
+STACK                  STACK          DGROUP         09e8:0000       0000c800
 
 
                         +----------------+
@@ -487,7 +487,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibc.lib(bexpand.c)
                         |   Linker Statistics   |
                         +-----------------------+
 
-Stack size:  ea60 (60000.)
-Memory size:  000188e0 (100576.)
+Stack size:  c800 (51200.)
+Memory size:  00016680 (91776.)
 Entry point address: 0000:51da
 Link time: 00:00.00

diff --git a/fmemtest.exe b/fmemtest.exe
index cdc38ac9e4b5f90cd573e7b461b9efae42d4bdf8..748b7ca4e799c94fe701ed493d6ec8e0042bcd2d 100755 (executable)
Binary files a/fmemtest.exe and b/fmemtest.exe differ

diff --git a/fontgfx.exe b/fontgfx.exe
index b80d8570b23444e26a302e0d3decd0b60575bb25..9c3d00f822e2160364315b983de4631e1a1c9e21 100755 (executable)
Binary files a/fontgfx.exe and b/fontgfx.exe differ

diff --git a/fonttest.exe b/fonttest.exe
index c79a97077457707a1dcc8828cef95d6b3de34345..82bd36e5aeabfda7a1389923a7137656c3300f6f 100755 (executable)
Binary files a/fonttest.exe and b/fonttest.exe differ

diff --git a/inputest.exe b/inputest.exe
index b846dab0398e3653cb601986879b20fa380e8e20..7d469411b4c1859ae6d9ec6df04fe3783a0f08de 100755 (executable)
Binary files a/inputest.exe and b/inputest.exe differ

diff --git a/makefile b/makefile
index c1c7abb92e5de9a06acaf6fce6d50123d256625c..3c55e9d0bd3fe5fd16cafcd29e0d90f77d22077b 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -31,7 +31,7 @@ WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
 
 16FLAGS=-fh=16.hed
 BAKAPIFLAGS=-fh=bakapi.hed
-SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k60000#49152#32768#24576
+SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k51200#60000#49152#32768#24576
 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS)
 ZFLAGS=-zk0 -zq -zc -zp8# -zm
 CFLAGS=$(IFLAGS) -mc -lr -l=dos -wo -x# -d2##wwww

diff --git a/maptest.exe b/maptest.exe
index bd1df2a2a92598b546e1b8f967c0d4c195af0c42..c1f14768f769500eacabac160a5d9e900500a8d5 100755 (executable)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/palettec.exe b/palettec.exe
index d033d9af1b6acffee2f1bce3deb1c292d67fcdbc..e6f60c0373c30e4a07540c8c92898de9df57e754 100755 (executable)
Binary files a/palettec.exe and b/palettec.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index c7168bb11c9590934a1d3693db09e2b81f9b4ce9..0f0401ea1549a7eef4d0c55161c7ad923cb2bda2 100755 (executable)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/scroll.exe b/scroll.exe
index 6474ed28f8ee2abed319271ac1029a0d65bc07c7..174fc9a8b3830dba5bb0d85d29f92256aba71f45 100755 (executable)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index deaeb1fe60e39864872e79152089320f3868fbff..7305f1dd238a2c6fe2daaccb82f79c5a0a10ecc6 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -396,7 +396,7 @@ void mapScrollDown(map_view_t *mv, player_t *player, word id, word plid)
 sword chkmap(map_t *map, word q)
 {
 //     bitmap_t bp;
-       static byte x[(MAPW*MAPH)+1] = {
+       static byte x[(MAPW*MAPH)+1] = /*{
 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
@@ -412,7 +412,7 @@ sword chkmap(map_t *map, word q)
 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60
-       };
+};*/
 /*{
 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 1, 2, 3, 4,
 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 5, 6, 7, 8,
@@ -434,7 +434,7 @@ sword chkmap(map_t *map, word q)
 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 5, 6, 7, 8,
 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 1, 2, 3, 4
        };*/
-// 1, 2, 3, 4, 0, 3, 3, 3, 3, 3, 3, 3, 3, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 6, 7, 8, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 10, 11, 12, 4, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 0, 1, 1, 1, 5, 8, 1, 11, 11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 4, 0, 0, 0, 0, 0, 8, 8, 1, 11, 11, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 8, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 1, 2, 3, 4, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 5, 6, 7, 8, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 9, 10, 11, 12, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10 };
+{ 1, 2, 3, 4, 0, 3, 3, 3, 3, 3, 3, 3, 3, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 6, 7, 8, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 10, 11, 12, 4, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 0, 1, 1, 1, 5, 8, 1, 11, 11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 4, 0, 0, 0, 0, 0, 8, 8, 1, 11, 11, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 8, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 1, 2, 3, 4, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 5, 6, 7, 8, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 9, 10, 11, 12, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10 };
 /*1,   2,      3,      4,      0,      3,      3,      3,      3,      3,      3,      3,      3,      4,      1,      1,      1,      1,      1,      1,      \
 5,     6,      7,      8,      0,      1,      0,      1,      0,      0,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      \
 9,     10,     11,     12,     4,      1,      0,      1,      0,      0,      1,      1,      1,      1,      1,      1,      1,      1,      1,      1,      \

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 31f13d9f6778c99af19a07393a595cb99ab377d8..2b7d9a67c9eabd9702fa18db8585c8a17f0ef3be 100755 (executable)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -52,8 +52,8 @@ typedef struct
 #define TILEWH 16
 #define QUADWH                 TILEWH/2
 //for null map!
-#define MAPW   20
-#define MAPH   15
+#define MAPW   40
+#define MAPH   30
 
 //map_t allocMap(int w, int h);
 //void initMap(map_t *map);

diff --git a/src/scroll.c b/src/scroll.c
index 8ea0507ceccb78f0b8deb5de9c33a1b450f48773..83e6ca4217db754ae2022f524756f9293a0c188f 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -29,20 +29,23 @@
 
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */
 
+global_game_variables_t gvar;
+static map_t map;
+player_t player[MaxPlayers];
+page_t screen, screen2, screen3;
+map_view_t mv[3];
+map_view_t *bg, *spri, *mask;//, *tmp;
+planar_buf_t *p;
+
 void main()
 {
 //     word panswitch=0, panq=1, pand=0;
-       global_game_variables_t gvar;
        word panpagenum=0; //for panning!
        int i;
        static word paloffset=0;
-       planar_buf_t *p;
        const char *cpus;
        //static int persist_aniframe = 0;    /* gonna be increased to 1 before being used, so 0 is ok for default */
-       page_t screen, screen2, screen3;
-       static map_t map;
-       map_view_t mv[3];
-       map_view_t *bg, *spri, *mask;//, *tmp;
+
        //map_view_db_t pgid[4];
 #ifdef FADE
        byte *dpal, *gpal;
@@ -50,7 +53,6 @@ void main()
        byte *ptr;
        byte *mappalptr;
        byte *mesg=malloc(sizeof(dword));
-       player_t player[MaxPlayers];
 
        player[0].persist_aniframe=0;
        player[0].speed=4;

diff --git a/test.exe b/test.exe
index 50a400c71da1d29b5064572fc858d7e42366c2c3..8caeaa315596f497592fce4ba690dffcb36ac1cf 100755 (executable)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index cec7013a9446316a61a9952728ba670797138ca4..c2d3cbab8a33d2f6958e3ca969157f9dd4ab0c04 100755 (executable)
Binary files a/test2.exe and b/test2.exe differ

diff --git a/vgmtest.exe b/vgmtest.exe
index 11f00107fc61f12ccfe377b4da34e94fec4bdb18..3f7c0ec03b9d1d23dc7750187c1cc8e65efdec70 100755 (executable)
Binary files a/vgmtest.exe and b/vgmtest.exe differ