ww

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

diff --git a/16.map b/16.map
index 290e0713cc24257e5be7dd65d2e29b228833293d..e25591aaf7b3c7dfca5391cf0ea6a02f3445659d 100755 (executable)
--- a/16.map
+++ b/16.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-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/10/15 17:26:14
+Created on:       15/10/15 17:33:59
 Executable Image: 16.exe
 creating a DOS executable
 
@@ -664,4 +664,4 @@ gfx.lib
 Stack size:  dac0 (56000.)
 Memory size:  00022d60 (142688.)
 Entry point address: 08ed:0072
-Link time: 00:00.97
+Link time: 00:00.11

diff --git a/bakapi.map b/bakapi.map
index 4dbe76ff6cf63823e722baa71a8b118ceb554ddd..68ab3b8e6d437e65b02801bc56a966e2cf9ad021 100755 (executable)
--- a/bakapi.map
+++ b/bakapi.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-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/10/15 17:26:15
+Created on:       15/10/15 17:33:59
 Executable Image: bakapi.exe
 creating a DOS executable
 
@@ -676,4 +676,4 @@ gfx.lib
 Stack size:  dac0 (56000.)
 Memory size:  00023670 (145008.)
 Entry point address: 07d7:022c
-Link time: 00:00.37
+Link time: 00:00.55

diff --git a/exmmtest.map b/exmmtest.map
index d9b3366e8a4aac3b8367d6f0410177dd0393375c..4cda3a10d3b743e552abd51a89681e372e34cd6f 100755 (executable)
--- a/exmmtest.map
+++ b/exmmtest.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-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/10/15 17:26:15
+Created on:       15/10/15 17:33:59
 Executable Image: exmmtest.exe
 creating a DOS executable
 
@@ -577,4 +577,4 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fpeint.c)
 Stack size:  dac0 (56000.)
 Memory size:  0001d5b0 (120240.)
 Entry point address: 0000:8024
-Link time: 00:00.40
+Link time: 00:00.39

diff --git a/fmemtest.map b/fmemtest.map
index 690a1d3f3dfceb8e750332211a566c376b08759f..df457541cf4e92a5d1cdf0aef5bada18c763bb34 100755 (executable)
--- a/fmemtest.map
+++ b/fmemtest.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-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/10/15 17:26:15
+Created on:       15/10/15 17:34:00
 Executable Image: fmemtest.exe
 creating a DOS executable
 
@@ -576,4 +576,4 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fpeint.c)
 Stack size:  dac0 (56000.)
 Memory size:  0001d3e0 (119776.)
 Entry point address: 0000:7e06
-Link time: 00:00.71
+Link time: 00:00.07

diff --git a/fontgfx.map b/fontgfx.map
index a2b1407a66cd5357f3e627b40109550471b4abce..b03569f0b00a5c3b65874420e8e3e00d8848c482 100755 (executable)
--- a/fontgfx.map
+++ b/fontgfx.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-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/10/15 17:26:15
+Created on:       15/10/15 17:34:00
 Executable Image: fontgfx.exe
 creating a DOS executable
 
@@ -638,4 +638,4 @@ gfx.lib
 Stack size:  dac0 (56000.)
 Memory size:  00021170 (135536.)
 Entry point address: 0000:7ce8
-Link time: 00:00.10
+Link time: 00:00.73

diff --git a/fonttest.map b/fonttest.map
index a55f3a2253badcc2cfca542492e9cb53a6726cbc..1b4c2be32c5537a884bdb7c43987d5bc24a55c84 100755 (executable)
--- a/fonttest.map
+++ b/fonttest.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-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/10/15 17:26:15
+Created on:       15/10/15 17:34:00
 Executable Image: fonttest.exe
 creating a DOS executable
 
@@ -588,4 +588,4 @@ gfx.lib
 Stack size:  dac0 (56000.)
 Memory size:  0001d960 (121184.)
 Entry point address: 0000:7d82
-Link time: 00:00.65
+Link time: 00:00.73

diff --git a/inputest.map b/inputest.map
index dfc8d712333b95a5087c5b6d090257746d3e4e81..f033ac9e3c778176f5eec5b5be3c1c013c0aae40 100755 (executable)
--- a/inputest.map
+++ b/inputest.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-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/10/15 17:26:15
+Created on:       15/10/15 17:34:00
 Executable Image: inputest.exe
 creating a DOS executable
 
@@ -572,4 +572,4 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fpeint.c)
 Stack size:  dac0 (56000.)
 Memory size:  0001d1b0 (119216.)
 Entry point address: 0000:7ad2
-Link time: 00:00.77
+Link time: 00:00.48

diff --git a/maptest.map b/maptest.map
index 3b652c59d92bce851a4cb09a372c614439285106..5194ae4a70df1520a90bea761ceac1d1eecf1e8f 100755 (executable)
--- a/maptest.map
+++ b/maptest.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-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/10/15 17:26:15
+Created on:       15/10/15 17:34:00
 Executable Image: maptest.exe
 creating a DOS executable
 
@@ -658,4 +658,4 @@ gfx.lib
 Stack size:  dac0 (56000.)
 Memory size:  00022af0 (142064.)
 Entry point address: 08e3:0072
-Link time: 00:00.00
+Link time: 00:00.95

diff --git a/palettec.map b/palettec.map
index fc8efb531617b7694f2113941b65862fa5f7d72c..1710c30b61e72233f061fa1c2e4d15a5c316918c 100755 (executable)
--- a/palettec.map
+++ b/palettec.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-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/10/15 17:26:15
+Created on:       15/10/15 17:34:00
 Executable Image: palettec.exe
 creating a DOS executable
 
@@ -636,4 +636,4 @@ gfx.lib
 Stack size:  dac0 (56000.)
 Memory size:  00020c00 (134144.)
 Entry point address: 0000:7cd6
-Link time: 00:00.21
+Link time: 00:00.13

diff --git a/palettel.map b/palettel.map
index 079a5342beae9c4fd5a8bded47830325d5c7d3d1..2b535ecca957b382186bb5d511c966a3e3853af2 100755 (executable)
--- a/palettel.map
+++ b/palettel.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-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/10/15 17:26:15
+Created on:       15/10/15 17:34:00
 Executable Image: palettel.exe
 creating a DOS executable
 
@@ -641,4 +641,4 @@ gfx.lib
 Stack size:  dac0 (56000.)
 Memory size:  00020cb0 (134320.)
 Entry point address: 0000:7d80
-Link time: 00:00.58
+Link time: 00:00.28

diff --git a/pcxtest.map b/pcxtest.map
index e3dad441d74d144d481e256e620316b0ed5fbb85..699384e662fe6ba2fe044c91fc5b5480ac255270 100755 (executable)
--- a/pcxtest.map
+++ b/pcxtest.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-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/10/15 17:26:15
+Created on:       15/10/15 17:34:00
 Executable Image: pcxtest.exe
 creating a DOS executable
 
@@ -507,4 +507,4 @@ gfx.lib
 Stack size:  dac0 (56000.)
 Memory size:  0001a6e0 (108256.)
 Entry point address: 0000:03d6
-Link time: 00:00.18
+Link time: 00:00.61

diff --git a/pcxtest2.map b/pcxtest2.map
index e9c1200e3d35ae0ce20d84eac73172eb4e7c3c54..4a7246d49775c9e5e3571342175e0c998372a59a 100755 (executable)
--- a/pcxtest2.map
+++ b/pcxtest2.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-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/10/15 17:26:15
+Created on:       15/10/15 17:34:00
 Executable Image: pcxtest2.exe
 creating a DOS executable
 
@@ -507,4 +507,4 @@ gfx.lib
 Stack size:  dac0 (56000.)
 Memory size:  0001a720 (108320.)
 Entry point address: 0000:0416
-Link time: 00:00.98
+Link time: 00:00.93

diff --git a/scroll.exe b/scroll.exe
index b00bc40fdd5e1cce056119dd4c8a0157cdb9a8dd..bfb11c78495045bf7aa8d680e195ca77e67ccfd1 100755 (executable)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/scroll.map b/scroll.map
index 3faeda5ace9270e1297fcda8c62f637a8ddef69b..92a131f993c054fa6d1fa0e219b76bef3a2c59bf 100755 (executable)
--- a/scroll.map
+++ b/scroll.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-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/10/15 17:26:15
+Created on:       15/10/15 17:34:00
 Executable Image: scroll.exe
 creating a DOS executable
 
@@ -13,7 +13,7 @@ creating a DOS executable
 Group                           Address              Size
 =====                           =======              ====
 
-DGROUP                          1a3e:0000            0000f8a0
+DGROUP                          1a46:0000            0000f8a0
 
 
 
@@ -36,30 +36,30 @@ kitten_TEXT            CODE           AUTO           0000:7c70       0000080a
 16_hc_TEXT             CODE           AUTO           0000:8480       0000158b
 timer_TEXT             CODE           AUTO           0000:9a10       00000235
 _TEXT                  CODE           AUTO           09c5:0000       00009db9
-scroll16_TEXT          CODE           AUTO           09c5:9dc0       0000373d
-bitmap_TEXT            CODE           AUTO           09c5:d500       0000064d
-planar_TEXT            CODE           AUTO           09c5:db50       00000275
-16text_TEXT            CODE           AUTO           09c5:ddd0       0000010d
-modex16_TEXT           CODE           AUTO           17b3:0000       000026f2
-16_in13_DATA           FAR_DATA       AUTO           1a23:0000       000001a4
-FAR_DATA               FAR_DATA       AUTO           1a3d:0004       00000000
-_NULL                  BEGDATA        DGROUP         1a3e:0000       00000020
-_AFTERNULL             BEGDATA        DGROUP         1a40:0000       00000002
-CONST                  DATA           DGROUP         1a40:0002       00000076
-CONST2                 DATA           DGROUP         1a47:0008       00000132
-_DATA                  DATA           DGROUP         1a5b:0000       00000b14
-XIB                    DATA           DGROUP         1b0c:0004       00000000
-XI                     DATA           DGROUP         1b0c:0004       0000003c
-XIE                    DATA           DGROUP         1b10:0000       00000000
-YIB                    DATA           DGROUP         1b10:0000       00000000
-YI                     DATA           DGROUP         1b10:0000       00000018
-YIE                    DATA           DGROUP         1b11:0008       00000000
-STRINGS                DATA           DGROUP         1b11:0008       00000000
-DATA                   DATA           DGROUP         1b11:0008       00000000
-_emu_init_start        EMU            DGROUP         1b11:0008       00000000
-_emu_init_end          EMU            DGROUP         1b11:0008       00000000
-_BSS                   BSS            DGROUP         1b12:0000       00001096
-STACK                  STACK          DGROUP         1c1c:0000       0000dac0
+scroll16_TEXT          CODE           AUTO           09c5:9dc0       000037b9
+bitmap_TEXT            CODE           AUTO           09c5:d580       0000064d
+planar_TEXT            CODE           AUTO           09c5:dbd0       00000275
+16text_TEXT            CODE           AUTO           09c5:de50       0000010d
+modex16_TEXT           CODE           AUTO           17bb:0000       000026f2
+16_in13_DATA           FAR_DATA       AUTO           1a2b:0000       000001a4
+FAR_DATA               FAR_DATA       AUTO           1a45:0004       00000000
+_NULL                  BEGDATA        DGROUP         1a46:0000       00000020
+_AFTERNULL             BEGDATA        DGROUP         1a48:0000       00000002
+CONST                  DATA           DGROUP         1a48:0002       00000076
+CONST2                 DATA           DGROUP         1a4f:0008       00000132
+_DATA                  DATA           DGROUP         1a63:0000       00000b14
+XIB                    DATA           DGROUP         1b14:0004       00000000
+XI                     DATA           DGROUP         1b14:0004       0000003c
+XIE                    DATA           DGROUP         1b18:0000       00000000
+YIB                    DATA           DGROUP         1b18:0000       00000000
+YI                     DATA           DGROUP         1b18:0000       00000018
+YIE                    DATA           DGROUP         1b19:0008       00000000
+STRINGS                DATA           DGROUP         1b19:0008       00000000
+DATA                   DATA           DGROUP         1b19:0008       00000000
+_emu_init_start        EMU            DGROUP         1b19:0008       00000000
+_emu_init_end          EMU            DGROUP         1b19:0008       00000000
+_BSS                   BSS            DGROUP         1b1a:0000       00001096
+STACK                  STACK          DGROUP         1c24:0000       0000dac0
 
 
                         +----------------+
@@ -73,15 +73,15 @@ Address        Symbol
 =======        ======
 
 Module: scroll.o(/dos/z/16/src/scroll.c)
-1a3e:0d40+     _player
-1a3e:0e40+     _mv
-1a3e:0e70+     _gvar
-1a3e:0f28+     _spri
-1a3e:0f2c+     _mask
-1a3e:0f30+     _p
-1a3e:0f34*     _t
-1a3e:0f44+     _bg
-1a3e:0f48+     _bakapee
+1a46:0d40+     _player
+1a46:0e40+     _mv
+1a46:0e70+     _gvar
+1a46:0f28+     _spri
+1a46:0f2c+     _mask
+1a46:0f30+     _p
+1a46:0f34*     _t
+1a46:0f44+     _bg
+1a46:0f48+     _bakapee
 0000:02dc      main_
 Module: mapread.o(/dos/z/16/src/lib/mapread.c)
 0000:1170+     jsoneq_
@@ -91,7 +91,7 @@ Module: jsmn.o(/dos/z/16/src/lib/jsmn/jsmn.c)
 0000:1d22      jsmn_parse_
 0000:221e      jsmn_init_
 Module: 16_in.o(/dos/z/16/src/lib/16_in.c)
-1a3e:0f6e+     _inpu
+1a46:0f6e+     _inpu
 0000:23b0+     INL_KeyService_
 0000:264a+     Mouse_
 0000:26a2+     IN_GetJoyAbs_
@@ -139,9 +139,9 @@ Module: 16_mm.o(/dos/z/16/src/lib/16_mm.c)
 0000:697c+     MM_TotalFree_
 0000:6a12*     MM_Report_
 0000:73ca*     MM_BombOnError_
-1a3e:10d0+     _beforesort
-1a3e:10d4+     _aftersort
-1a3e:10d8+     _XMSaddr
+1a46:10d0+     _beforesort
+1a46:10d4+     _aftersort
+1a46:10d8+     _XMSaddr
 Module: wcpu.o(/dos/z/16/src/lib/wcpu/wcpu.c)
 0000:7400      detectcpu_
 Module: 16_head.o(/dos/z/16/src/lib/16_head.c)
@@ -159,9 +159,9 @@ Module: 16_ca.o(/dos/z/16/src/lib/16_ca.c)
 0000:7b40*     CAL_OptimizeNodes_
 0000:7bf0*     CA_Startup_
 0000:7c40*     CA_Shutdown_
-1a3e:10e0*     _finishcachebox
-1a3e:10e4*     _updatecachebox
-1a3e:10e8*     _drawcachebox
+1a46:10e0*     _finishcachebox
+1a46:10e4*     _updatecachebox
+1a46:10e8*     _drawcachebox
 Module: kitten.o(/dos/z/16/src/lib/nyan/kitten.c)
 0000:7cac      KITTENGETS
 0000:7d0c*     kittenopen_
@@ -172,7 +172,7 @@ Module: kitten.o(/dos/z/16/src/lib/nyan/kitten.c)
 0000:8264+     get_line_
 0000:82d6+     db_fetch_
 0000:836c+     db_insert_
-1a3e:04d4+     __kitten_catalog
+1a46:04d4+     __kitten_catalog
 Module: 16_hc.o(/dos/z/16/src/lib/16_hc.c)
 0000:862c+     LargestFreeBlock_
 0000:86ba+     _coreleft_
@@ -199,100 +199,100 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(stk086.asm)
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fmalloc.c)
 09c5:0042      _fmalloc_
 09c5:0042      malloc_
-1a3e:04f6      ___fheap
-1a3e:04f8      ___fheapRover
-1a3e:04fa      ___LargestSizeB4Rover
+1a46:04f6      ___fheap
+1a46:04f8      ___fheapRover
+1a46:04fa      ___LargestSizeB4Rover
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(pia.asm)
 09c5:01bf      __PIA
 09c5:01b8*     __PIS
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(printf.c)
 09c5:01d6      printf_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(iob.c)
-1a3e:04fc      ___iob
-1a3e:10f4      ___ClosedStreams
-1a3e:10f8      ___OpenStreams
+1a46:04fc      ___iob
+1a46:10f4      ___ClosedStreams
+1a46:10f8      ___OpenStreams
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fprintf.c)
 09c5:0205      fprintf_
 Module: gfx.lib(/dos/z/16/src/lib/scroll16.c)
 09c5:9e56      walk_
 09c5:ba56+     mapScrollRight_
-09c5:bd50+     mapScrollLeft_
-09c5:c004+     mapScrollUp_
-09c5:c2f2+     mapScrollDown_
-09c5:c61e      chkmap_
-09c5:c7ae      mapGoTo_
-09c5:ca22+     mapDrawTile_
-09c5:cb46+     mapDrawRow_
-09c5:ccb4+     mapDrawCol_
-09c5:ce3c+     mapDrawWRow_
-09c5:cf8a*     mapDrawWCol_
-09c5:d0f0      shinku_
-09c5:d278+     animatePlayer_
+09c5:bd7a+     mapScrollLeft_
+09c5:c04c+     mapScrollUp_
+09c5:c342+     mapScrollDown_
+09c5:c69a      chkmap_
+09c5:c82a      mapGoTo_
+09c5:ca9e+     mapDrawTile_
+09c5:cbc2+     mapDrawRow_
+09c5:cd30+     mapDrawCol_
+09c5:ceb8+     mapDrawWRow_
+09c5:d006*     mapDrawWCol_
+09c5:d16c      shinku_
+09c5:d2f4+     animatePlayer_
 Module: gfx.lib(/dos/z/16/src/lib/bitmap.c)
-09c5:d886      bitmapLoadPcx_
-09c5:d9e2*     bitmapLoadPcxTiles_
+09c5:d906      bitmapLoadPcx_
+09c5:da62*     bitmapLoadPcxTiles_
 Module: gfx.lib(/dos/z/16/src/lib/planar.c)
-09c5:db50      planar_buf_from_bitmap_
-09c5:dc70+     planar_buf_alloc_
-09c5:dd6a*     planar_buf_free_
+09c5:dbd0      planar_buf_from_bitmap_
+09c5:dcf0+     planar_buf_alloc_
+09c5:ddea*     planar_buf_free_
 Module: gfx.lib(/dos/z/16/src/lib/16text.c)
-09c5:de46      textInit_
-1a3e:1180      _romFonts
+09c5:dec6      textInit_
+1a46:1180      _romFonts
 Module: gfx.lib(/dos/z/16/src/lib/modex16.c)
-17b3:023c      VGAmodeX_
-17b3:02ce+     vgaGetMode_
-17b3:030e+     modexEnter_
-17b3:058e*     modexLeave_
-17b3:05a6+     modexsetBaseXMode_
-17b3:05e4      modexDefaultPage_
-17b3:06c4      modexNextPage_
-17b3:0790      modexNextPageFlexibleSize_
-17b3:085e      modexShowPage_
-17b3:095a*     modexPanPage_
-17b3:09aa*     modexSelectPlane_
-17b3:09ce      modexClearRegion_
-17b3:0ae6*     oldDrawBmp_
-17b3:0c4c*     CDrawBmp_
-17b3:0db0*     modexDrawBmp_
-17b3:0e16+     modexDrawBmpRegion_
-17b3:0f80*     modex_sparky4_DrawBmpRegion_
-17b3:10ea*     modexDrawPlanarBuf_
-17b3:1108*     modexDrawSprite_
-17b3:116e+     modexDrawSpriteRegion_
-17b3:12e6      modexCopyPageRegion_
-17b3:1450*     modexFadeOn_
-17b3:1480*     modexFadeOff_
-17b3:14ae*     modexFlashOn_
-17b3:14dc*     modexFlashOff_
-17b3:15ac+     modexPalSave_
-17b3:1602      modexNewPal_
-17b3:1652*     modexLoadPalFile_
-17b3:1734*     modexSavePalFile_
-17b3:17ac*     modexPalBlack_
-17b3:17d6*     modexPalWhite_
-17b3:1800+     modexPalUpdate_
-17b3:1d70+     modexPalUpdate1_
-17b3:1dea*     modexPalUpdate0_
-17b3:1e36+     chkcolor_
-17b3:214e+     modexputPixel_
-17b3:21dc*     modexgetPixel_
-17b3:2262*     modexhlin_
-17b3:22e6      modexprint_
-17b3:2480*     modexprintbig_
-17b3:25fc      pdump_
-17b3:265c*     cls_
-17b3:26ca      modexWaitBorder_
-1a3e:0b54+     _VGA
+17bb:023c      VGAmodeX_
+17bb:02ce+     vgaGetMode_
+17bb:030e+     modexEnter_
+17bb:058e*     modexLeave_
+17bb:05a6+     modexsetBaseXMode_
+17bb:05e4      modexDefaultPage_
+17bb:06c4      modexNextPage_
+17bb:0790      modexNextPageFlexibleSize_
+17bb:085e      modexShowPage_
+17bb:095a*     modexPanPage_
+17bb:09aa*     modexSelectPlane_
+17bb:09ce      modexClearRegion_
+17bb:0ae6*     oldDrawBmp_
+17bb:0c4c*     CDrawBmp_
+17bb:0db0*     modexDrawBmp_
+17bb:0e16+     modexDrawBmpRegion_
+17bb:0f80*     modex_sparky4_DrawBmpRegion_
+17bb:10ea*     modexDrawPlanarBuf_
+17bb:1108*     modexDrawSprite_
+17bb:116e+     modexDrawSpriteRegion_
+17bb:12e6      modexCopyPageRegion_
+17bb:1450*     modexFadeOn_
+17bb:1480*     modexFadeOff_
+17bb:14ae*     modexFlashOn_
+17bb:14dc*     modexFlashOff_
+17bb:15ac+     modexPalSave_
+17bb:1602      modexNewPal_
+17bb:1652*     modexLoadPalFile_
+17bb:1734*     modexSavePalFile_
+17bb:17ac*     modexPalBlack_
+17bb:17d6*     modexPalWhite_
+17bb:1800+     modexPalUpdate_
+17bb:1d70+     modexPalUpdate1_
+17bb:1dea*     modexPalUpdate0_
+17bb:1e36+     chkcolor_
+17bb:214e+     modexputPixel_
+17bb:21dc*     modexgetPixel_
+17bb:2262*     modexhlin_
+17bb:22e6      modexprint_
+17bb:2480*     modexprintbig_
+17bb:25fc      pdump_
+17bb:265c*     cls_
+17bb:26ca      modexWaitBorder_
+1a46:0b54+     _VGA
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(sound.c)
 09c5:0234      sound_
 09c5:026f      nosound_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(atoi.c)
 09c5:027b      atoi_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(cstart)
-1a3e:0000*     __nullarea
-1a3e:0b68*     __ovlflag
-1a3e:0b69*     __intno
-1a3e:0b6a*     __ovlvec
+1a46:0000*     __nullarea
+1a46:0b68*     __ovlflag
+1a46:0b69*     __intno
+1a46:0b6a*     __ovlvec
 09c5:0316      _cstart_
 09c5:03e9*     _Not_Enough_Memory_
 09c5:051b      __exit_
@@ -302,10 +302,10 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(cmodel.asm)
 09c5:05a2      _big_code_
 09c5:05a2*     CodeModelMismatch
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(argcv.c)
-1a3e:1a98      __argv
-1a3e:1a9c      ___argv
-1a3e:1aa0      __argc
-1a3e:1aa2      ___argc
+1a46:1a98      __argv
+1a46:1a9c      ___argv
+1a46:1aa0      __argc
+1a46:1aa2      ___argc
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(strncmp.c)
 09c5:05a2      strncmp_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(strstr.c)
@@ -319,7 +319,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fread.c)
 09c5:0bb6      fread_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(errno.c)
 09c5:0f2d      __get_errno_ptr_
-1a3e:1aa4      _errno
+1a46:1aa4      _errno
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(frealloc.c)
 09c5:0f34*     _frealloc_
 09c5:0f34      realloc_
@@ -348,22 +348,22 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(memavl.c)
 09c5:13ac      _memavl_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(nmalloc.c)
 09c5:13f1      _nmalloc_
-1a3e:0b6e      ___nheapbeg
-1a3e:0b70      ___MiniHeapRover
-1a3e:0b72      ___LargestSizeB4MiniHeapRover
+1a46:0b6e      ___nheapbeg
+1a46:0b70      ___MiniHeapRover
+1a46:0b72      ___LargestSizeB4MiniHeapRover
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ffree.c)
 09c5:14cb      _ffree_
 09c5:14cb      free_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(nfree.c)
 09c5:1538      _nfree_
-1a3e:1aa6+     ___MiniHeapFreeRover
+1a46:1aa6+     ___MiniHeapFreeRover
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(exit.c)
 09c5:1633+     _null_exit_rtn_
 09c5:1633+     __null_int23_exit_
 09c5:1634      exit_
 09c5:1655+     _exit_
-1a3e:0b74+     ___int23_exit
-1a3e:0b78      ___FPE_handler_exit
+1a46:0b74+     ___int23_exit
+1a46:0b78      ___FPE_handler_exit
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ltoa.c)
 09c5:1671      ultoa_
 09c5:172f*     ltoa_
@@ -373,7 +373,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fclose.c)
 09c5:1ae1      __doclose_
 09c5:1c2b      __shutdown_stream_
 09c5:1c45      fclose_
-1a3e:1aa8+     ___RmTmpFileFn
+1a46:1aa8+     ___RmTmpFileFn
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(clockdos.c)
 09c5:1cb0+     __ibm_bios_get_ticks_
 09c5:1d27      clock_
@@ -384,7 +384,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ftell.c)
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fseek.c)
 09c5:1f4b      fseek_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(istable.c)
-1a3e:0098      __IsTable
+1a46:0098      __IsTable
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(tolower.c)
 09c5:2143      tolower_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(unlnk.c)
@@ -419,31 +419,31 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(nheapwal.c)
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(stack086.c)
 09c5:293d      stackavail_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(_8087086.asm)
-1a3e:0b84      __8087
-1a3e:0b85      __real87
-1a3e:0b86      __dos87emucall
-1a3e:0b88      __dos87real
+1a46:0b84      __8087
+1a46:0b85      __real87
+1a46:0b86      __dos87emucall
+1a46:0b88      __dos87real
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(xmsg.c)
 09c5:294c*     __exit_with_msg_
 09c5:2951      __fatal_runtime_error_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(crwdata)
-1a3e:0b8a      __curbrk
-1a3e:0b92      __STACKLOW
-1a3e:0b94      __STACKTOP
-1a3e:0b96      __cbyte
-1a3e:0b98      __child
-1a3e:0b9a      __no87
-1a3e:0ba7      ___FPE_handler
-1a3e:0b8c      __psp
-1a3e:0b9b      __get_ovl_stack
-1a3e:0b9f      __restore_ovl_stack
-1a3e:0ba3      __close_ovl_file
-1a3e:0bab      __LpCmdLine
-1a3e:0baf      __LpPgmName
-1a3e:0b8e      __osmajor
-1a3e:0b8f      __osminor
-1a3e:0b90      __osmode
-1a3e:0b91      __HShift
+1a46:0b8a      __curbrk
+1a46:0b92      __STACKLOW
+1a46:0b94      __STACKTOP
+1a46:0b96      __cbyte
+1a46:0b98      __child
+1a46:0b9a      __no87
+1a46:0ba7      ___FPE_handler
+1a46:0b8c      __psp
+1a46:0b9b      __get_ovl_stack
+1a46:0b9f      __restore_ovl_stack
+1a46:0ba3      __close_ovl_file
+1a46:0bab      __LpCmdLine
+1a46:0baf      __LpPgmName
+1a46:0b8e      __osmajor
+1a46:0b8f      __osminor
+1a46:0b90      __osmode
+1a46:0b91      __HShift
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mem.c)
 09c5:2970      __MemAllocator
 09c5:2a3a      __MemFree
@@ -461,7 +461,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ioexit.c)
 09c5:31a0*     fcloseall_
 09c5:31a7      __full_io_exit_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fltused.c)
-1a3e:0bb4      _fltused_
+1a46:0bb4      _fltused_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fgetc.c)
 09c5:31b1      __fill_buffer_
 09c5:3400      fgetc_
@@ -478,7 +478,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(initrtns.c)
 09c5:39e6      __FiniRtns
 09c5:39e6*     __FFiniRtns
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(uselfn.c)
-1a3e:0bba      ___uselfn
+1a46:0bba      ___uselfn
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(dosseg)
 09c5:3a4a      __DOSseg__
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(initargv.c)
@@ -487,9 +487,9 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(initargv.c)
 09c5:3dde      __Fini_Argv_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(comtflag.c)
 09c5:3e08*     __set_commode_
-1a3e:0bbc      __commode
+1a46:0bbc      __commode
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(textmode.c)
-1a3e:0bbe      __fmode
+1a46:0bbe      __fmode
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(chktty.c)
 09c5:3e14      __chktty_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(freefp.c)
@@ -520,7 +520,7 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(grownear.c)
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(nmemneed.c)
 09c5:4afa      __nmemneed_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(alphabet.c)
-1a3e:0050      ___Alphabet
+1a46:0050      ___Alphabet
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(__lseek.c)
 09c5:4afd      __lseek_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(dosret.c)
@@ -531,9 +531,9 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(dosret.c)
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(iomode.c)
 09c5:4bb6      __GetIOMode_
 09c5:4beb      __SetIOMode_nogrow_
-1a3e:0bd4      ___NFiles
-1a3e:0bd6      ___init_mode
-1a3e:0bfe      ___io_mode
+1a46:0bd4      ___NFiles
+1a46:0bd6      ___init_mode
+1a46:0bfe      ___io_mode
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(_clse.c)
 09c5:4c20      __close_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(flush.c)
@@ -553,9 +553,9 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(isatt.c)
 09c5:4f36      isatty_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(doserrno.c)
 09c5:4f52*     __get_doserrno_ptr_
-1a3e:1ab4      __doserrno
+1a46:1ab4      __doserrno
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(umaskval.c)
-1a3e:0c02      ___umaskval
+1a46:0c02      ___umaskval
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(creatdos.c)
 09c5:4f59      _dos_creat_
 09c5:4f7d*     _dos_creatnew_
@@ -566,9 +566,9 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(stiomode.c)
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(vsprintf.c)
 09c5:5186      vsprintf_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(environ.c)
-1a3e:1ab8      ___env_mask
-1a3e:1abc      _environ
-1a3e:1ac0*     __wenviron
+1a46:1ab8      ___env_mask
+1a46:1abc      _environ
+1a46:1ac0*     __wenviron
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbterm.c)
 09c5:51c8      _mbterm_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbsnextc.c)
@@ -589,12 +589,12 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(chk8087.c)
 09c5:571e      __chk8087_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(enterdb.c)
 09c5:578e      __EnterWVIDEO_
-1a3e:0c22+     ___WD_Present
+1a46:0c22+     ___WD_Present
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(heapen.c)
 09c5:57b2*     _heapenable_
-1a3e:0c24      ___heap_enabled
+1a46:0c24      ___heap_enabled
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(amblksiz.c)
-1a3e:0c26      __amblksiz
+1a46:0c26      __amblksiz
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fputc.c)
 09c5:57c3      fputc_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(prtf.c)
@@ -609,15 +609,15 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(gtche.c)
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(qwrit.c)
 09c5:6bcc      __qwrite_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(___argc.c)
-1a3e:1ac4      ____Argv
-1a3e:1ac8      ____Argc
+1a46:1ac4      ____Argv
+1a46:1ac8      ____Argc
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(sgdef086)
-1a3e:0ce4      __Start_XI
-1a3e:0d20      __End_XI
-1a3e:0d20      __Start_YI
-1a3e:0d38      __End_YI
+1a46:0ce4      __Start_XI
+1a46:0d20      __End_XI
+1a46:0d20      __Start_YI
+1a46:0d38      __End_YI
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(histsplt.c)
-1a3e:1aca      ___historical_splitparms
+1a46:1aca      ___historical_splitparms
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(bfree.c)
 09c5:6c2c      _bfree_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(bexpand.c)
@@ -633,22 +633,22 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(setenvp.c)
 09c5:70be      __setenvp_
 09c5:724a      __freeenvp_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbisdbcs.c)
-1a3e:0c28      ___IsDBCS
+1a46:0c28      ___IsDBCS
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbislead.c)
 09c5:72a8*     _ismbblead_
-1a3e:1ad0      ___MBCSIsTable
+1a46:1ad0      ___MBCSIsTable
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbinit.c)
 09c5:7302      __mbinit_
-1a3e:0c2a      ___MBCodePage
+1a46:0c2a      ___MBCodePage
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(mbdtoupp.c)
 09c5:73dd      _mbdtoupper_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(toupper.c)
 09c5:73eb      toupper_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(8087cw.c)
-1a3e:0c2c      __8087cw
+1a46:0c2c      __8087cw
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(save8087.c)
-1a3e:0c2e      ___Save8087
-1a3e:0c32      ___Rest8087
+1a46:0c2e      ___Save8087
+1a46:0c32      ___Rest8087
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(grabfp87.c)
 09c5:73fa      __GrabFP87_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ini87086.asm)
@@ -662,8 +662,8 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(itoa.c)
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(strupr.c)
 09c5:75c5      strupr_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(noefgfmt.c)
-1a3e:0c36      ___EFG_printf
-1a3e:0c3a      ___EFG_scanf
+1a46:0c36      ___EFG_printf
+1a46:0c3a      ___EFG_scanf
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(lltoa.c)
 09c5:760d      ulltoa_
 09c5:774a*     lltoa_
@@ -702,7 +702,7 @@ Module: /dos/fdos/watcom2/lib286/math87h.lib(strtod.c)
 09c5:9844+     __Strtold_
 09c5:9a83      strtod_
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fpeint.c)
-1a3e:0ce2      ___FPE_int
+1a46:0ce2      ___FPE_int
 Module: /dos/fdos/watcom2/lib286/math87h.lib(ldclass.c)
 09c5:9c30      __LDClass_
 09c5:9cb6*     _FLClass_
@@ -713,14 +713,14 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(seterrno.c)
 09c5:9d9e      __set_ERANGE_
 09c5:9daa*     __set_EINVAL_
 Module: /dos/fdos/watcom2/lib286/math87h.lib(inf_nan.c)
-1a3e:019a*     ___f_infinity
-1a3e:019e*     ___f_posqnan
-1a3e:01a2      ___d_infinity
-1a3e:01aa      ___d_posqnan
-1a3e:01b2*     ___ld_infinity
-1a3e:01ba*     ___ld_posqnan
+1a46:019a*     ___f_infinity
+1a46:019e*     ___f_posqnan
+1a46:01a2      ___d_infinity
+1a46:01aa      ___d_posqnan
+1a46:01b2*     ___ld_infinity
+1a46:01ba*     ___ld_posqnan
 Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(hugeval.c)
-1a3e:01c2      __HugeValue
+1a46:01c2      __HugeValue
 
 
                         +--------------------+
@@ -738,6 +738,6 @@ gfx.lib
                         +-----------------------+
 
 Stack size:  dac0 (56000.)
-Memory size:  00029c80 (171136.)
+Memory size:  00029d00 (171264.)
 Entry point address: 09c5:0316
-Link time: 00:00.93
+Link time: 00:00.66

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 8fd37e90fdd755df6f5607575c48037784cc66e6..29461fae895649a28364214f81981be3d3ec3a1b 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -301,12 +301,12 @@ void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid)
        }
 
        /* draw the next column */
-       x= mv[id].page->sw + mv[id].map->tiles->tileWidth;
+       x= mv[0].page->sw + mv[id].map->tiles->tileWidth;
        if(player[plid].q%4)
                if(id==0)
-                       mapDrawCol(&mv[0], mv[0].tx + 20 , mv[0].ty-1, x, player, mv->page->dx);
+                       mapDrawCol(&mv[0], mv[0].tx + mv[0].page->tilesw, mv[0].ty-1, x, player, mv->page->dx);
                else
-                       modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*17);
+                       modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*(mv[0].page->tilesh+2));
        //}
 }
 
@@ -335,7 +335,7 @@ void near mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid)
                if(id==0)
                        mapDrawCol(&mv[0], mv[0].tx - 1, mv[0].ty-1, x, player, mv->page->dx);
                else
-                       modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*17);
+                       modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*(mv[0].page->tilesh+2));
        //}
 }
 
@@ -363,7 +363,7 @@ void near mapScrollUp(map_view_t *mv, player_t *player, word id, word plid)
                if(id==0)
                        mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty-1, y, player, mv->page->dy);
                else
-                       modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*22, mv[id].map->tiles->tileHeight);
+                       modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*(mv[0].page->tilesw+2), mv[id].map->tiles->tileHeight);
        //}
 }
 
@@ -385,12 +385,12 @@ void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid)
        }
 
        /* draw the next row */
-       y= mv[id].page->sh + mv[id].map->tiles->tileHeight;
+       y= mv[0].page->sh + mv[id].map->tiles->tileHeight;
        if(player[plid].q%3)
                if(id==0)
-                       mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty+15, y, player, mv->page->dy);
+                       mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty+mv[0].page->tilesh, y, player, mv->page->dy);
                else
-                       modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*22, mv[id].map->tiles->tileHeight);
+                       modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*(mv[0].page->tilesw+2), mv[id].map->tiles->tileHeight);
        //}
 }
 

diff --git a/test.map b/test.map
index 6a6e25967677369ce7fb609b795cb8fcf1d36d35..7bb2cfde765296f5d0dcc2f3b0b69f04c4cae730 100755 (executable)
--- a/test.map
+++ b/test.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-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/10/15 17:26:15
+Created on:       15/10/15 17:34:00
 Executable Image: test.exe
 creating a DOS executable
 
@@ -410,4 +410,4 @@ gfx.lib
 Stack size:  dac0 (56000.)
 Memory size:  00016e60 (93792.)
 Entry point address: 0000:03c0
-Link time: 00:00.55
+Link time: 00:00.14

diff --git a/test2.map b/test2.map
index dc49728988f4f4c85c873ec88c5f1fd18be29c3c..7e17b85c74add95744db515f1e43db4e564aef70 100755 (executable)
--- a/test2.map
+++ b/test2.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-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/10/15 17:26:15
+Created on:       15/10/15 17:34:00
 Executable Image: test2.exe
 creating a DOS executable
 
@@ -422,4 +422,4 @@ gfx.lib
 Stack size:  dac0 (56000.)
 Memory size:  00017920 (96544.)
 Entry point address: 0000:0260
-Link time: 00:00.84
+Link time: 00:00.66

diff --git a/vgmtest.map b/vgmtest.map
index afc297a91d4c003d313abc33def4c511726c19a0..f9a4208f71800e1f46813223400a3b0ea36d1957 100755 (executable)
--- a/vgmtest.map
+++ b/vgmtest.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 16 2015 10:14:10 (64-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/10/15 17:26:15
+Created on:       15/10/15 17:34:00
 Executable Image: vgmtest.exe
 creating a DOS executable
 
@@ -606,4 +606,4 @@ vgmsnd.lib
 Stack size:  dac0 (56000.)
 Memory size:  0001f460 (128096.)
 Entry point address: 0000:7d06
-Link time: 00:00.24
+Link time: 00:00.98