From: sparky4 Date: Tue, 13 Oct 2015 20:26:28 +0000 (-0500) Subject: working on 256x192 X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=2ca5b67978f3f8441c5e72d143861df15f41962e;p=16.git working on 256x192 --- diff --git a/16.exe b/16.exe index 5c31da4d..5e5b87be 100755 Binary files a/16.exe and b/16.exe differ diff --git a/16.map b/16.map index f18157a2..eefc3e99 100755 --- 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/13 15:11:00 +Created on: 15/10/13 15:26:27 Executable Image: 16.exe creating a DOS executable @@ -193,8 +193,8 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(stk086.asm) 08e3:0025 __STKOVERFLOW_ Module: gfx.lib(/dos/z/16/src/lib/modex16.c) 08e3:7db4 VGAmodeX_ -08e3:7e5e* modex__320x240_256__Enter_ -08e3:7ebe+ modex__256x192_256__Enter_ +08e3:7e5e+ modex__320x240_256__Enter_ +08e3:7ebe* modex__256x192_256__Enter_ 08e3:7f1e* modexLeave_ 08e3:7f36+ modexsetBaseXMode_ 08e3:7f88* modexDefaultPage_ @@ -663,4 +663,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 000228e0 (141536.) Entry point address: 08e3:0072 -Link time: 00:00.52 +Link time: 00:00.13 diff --git a/bakapi.exe b/bakapi.exe index 613b9653..b53f3d1a 100755 Binary files a/bakapi.exe and b/bakapi.exe differ diff --git a/bakapi.map b/bakapi.map index b383bd60..c0057ab2 100755 --- 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/13 15:11:00 +Created on: 15/10/13 15:26:27 Executable Image: bakapi.exe creating a DOS executable @@ -184,8 +184,8 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(pia.asm) 07c6:00a8* __PIS Module: gfx.lib(/dos/z/16/src/lib/modex16.c) 07c6:9274 VGAmodeX_ -07c6:931e* modex__320x240_256__Enter_ -07c6:937e+ modex__256x192_256__Enter_ +07c6:931e+ modex__320x240_256__Enter_ +07c6:937e* modex__256x192_256__Enter_ 07c6:93de* modexLeave_ 07c6:93f6+ modexsetBaseXMode_ 07c6:9448 modexDefaultPage_ @@ -668,4 +668,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 00022fd0 (143312.) Entry point address: 07c6:022c -Link time: 00:00.28 +Link time: 00:00.61 diff --git a/exmmtest.map b/exmmtest.map index d18d0117..fb6d8d38 100755 --- 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/13 15:11:00 +Created on: 15/10/13 15:26:27 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: 0001d520 (120096.) Entry point address: 0000:8024 -Link time: 00:00.96 +Link time: 00:00.09 diff --git a/fmemtest.map b/fmemtest.map index d323dc24..00c63b11 100755 --- 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/13 15:11:00 +Created on: 15/10/13 15:26:27 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.61 +Link time: 00:00.98 diff --git a/fontgfx.exe b/fontgfx.exe index d6c45117..f6b12a9d 100755 Binary files a/fontgfx.exe and b/fontgfx.exe differ diff --git a/fontgfx.map b/fontgfx.map index 2a208abf..be794be1 100755 --- 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/13 15:11:00 +Created on: 15/10/13 15:26:27 Executable Image: fontgfx.exe creating a DOS executable @@ -181,8 +181,8 @@ Module: gfx.lib(/dos/z/16/src/lib/16text.c) 1188:0d94 _romFonts Module: gfx.lib(/dos/z/16/src/lib/modex16.c) 0f2e:01f4 VGAmodeX_ -0f2e:029e* modex__320x240_256__Enter_ -0f2e:02fe+ modex__256x192_256__Enter_ +0f2e:029e+ modex__320x240_256__Enter_ +0f2e:02fe* modex__256x192_256__Enter_ 0f2e:035e* modexLeave_ 0f2e:0376+ modexsetBaseXMode_ 0f2e:03c8 modexDefaultPage_ @@ -637,4 +637,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 00020d40 (134464.) Entry point address: 0000:7c3a -Link time: 00:00.41 +Link time: 00:00.29 diff --git a/fonttest.map b/fonttest.map index bccc743e..29ab235e 100755 --- 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/13 15:11:00 +Created on: 15/10/13 15:26:27 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.29 +Link time: 00:00.81 diff --git a/inputest.map b/inputest.map index 89814f8a..762d70f1 100755 --- 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/13 15:11:00 +Created on: 15/10/13 15:26:27 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.87 +Link time: 00:00.23 diff --git a/maptest.exe b/maptest.exe index 12fb274f..aa136ea7 100755 Binary files a/maptest.exe and b/maptest.exe differ diff --git a/maptest.map b/maptest.map index 6ceb0a25..084eabdf 100755 --- 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/13 15:11:00 +Created on: 15/10/13 15:26:27 Executable Image: maptest.exe creating a DOS executable @@ -399,8 +399,8 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fgetc.c) 08da:389e fgetc_ Module: gfx.lib(/dos/z/16/src/lib/modex16.c) 08da:83c4* VGAmodeX_ -08da:846e* modex__320x240_256__Enter_ -08da:84ce+ modex__256x192_256__Enter_ +08da:846e+ modex__320x240_256__Enter_ +08da:84ce* modex__256x192_256__Enter_ 08da:852e* modexLeave_ 08da:8546+ modexsetBaseXMode_ 08da:8598* modexDefaultPage_ @@ -657,4 +657,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 00022710 (141072.) Entry point address: 08da:0072 -Link time: 00:00.69 +Link time: 00:00.57 diff --git a/palettec.exe b/palettec.exe index 96138198..163b2a13 100755 Binary files a/palettec.exe and b/palettec.exe differ diff --git a/palettec.map b/palettec.map index 7b7cfda1..897410a9 100755 --- 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/13 15:11:00 +Created on: 15/10/13 15:26:27 Executable Image: palettec.exe creating a DOS executable @@ -187,8 +187,8 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(pia.asm) 0000:7c68* __PIS Module: gfx.lib(/dos/z/16/src/lib/modex16.c) 0f0f:01f4 VGAmodeX_ -0f0f:029e* modex__320x240_256__Enter_ -0f0f:02fe+ modex__256x192_256__Enter_ +0f0f:029e+ modex__320x240_256__Enter_ +0f0f:02fe* modex__256x192_256__Enter_ 0f0f:035e* modexLeave_ 0f0f:0376+ modexsetBaseXMode_ 0f0f:03c8* modexDefaultPage_ @@ -635,4 +635,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 00020810 (133136.) Entry point address: 0000:7c86 -Link time: 00:00.32 +Link time: 00:00.88 diff --git a/palettel.exe b/palettel.exe index a998fa3b..a4163851 100755 Binary files a/palettel.exe and b/palettel.exe differ diff --git a/palettel.map b/palettel.map index 45e6312c..4a91c7b3 100755 --- 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/13 15:11:00 +Created on: 15/10/13 15:26:27 Executable Image: palettel.exe creating a DOS executable @@ -183,8 +183,8 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(stk086.asm) 0000:7b55 __STKOVERFLOW_ Module: gfx.lib(/dos/z/16/src/lib/modex16.c) 0f2e:01f4 VGAmodeX_ -0f2e:029e* modex__320x240_256__Enter_ -0f2e:02fe+ modex__256x192_256__Enter_ +0f2e:029e+ modex__320x240_256__Enter_ +0f2e:02fe* modex__256x192_256__Enter_ 0f2e:035e* modexLeave_ 0f2e:0376+ modexsetBaseXMode_ 0f2e:03c8 modexDefaultPage_ @@ -655,4 +655,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 00021600 (136704.) Entry point address: 0000:7d20 -Link time: 00:00.44 +Link time: 00:00.68 diff --git a/pcxtest.exe b/pcxtest.exe index 7da93f3f..09609a9f 100755 Binary files a/pcxtest.exe and b/pcxtest.exe differ diff --git a/pcxtest.map b/pcxtest.map index 6f25a2ca..f58fb422 100755 --- 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/13 15:11:00 +Created on: 15/10/13 15:26:27 Executable Image: pcxtest.exe creating a DOS executable @@ -68,8 +68,8 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(stk086.asm) 0000:0275* __STKOVERFLOW_ Module: gfx.lib(/dos/z/16/src/lib/modex16.c) 0000:89b4 VGAmodeX_ -0000:8a5e* modex__320x240_256__Enter_ -0000:8abe+ modex__256x192_256__Enter_ +0000:8a5e+ modex__320x240_256__Enter_ +0000:8abe* modex__256x192_256__Enter_ 0000:8b1e* modexLeave_ 0000:8b36+ modexsetBaseXMode_ 0000:8b88 modexDefaultPage_ @@ -506,4 +506,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 0001a220 (107040.) Entry point address: 0000:02d8 -Link time: 00:00.50 +Link time: 00:00.68 diff --git a/pcxtest2.exe b/pcxtest2.exe index 94546efd..cfd0d339 100755 Binary files a/pcxtest2.exe and b/pcxtest2.exe differ diff --git a/pcxtest2.map b/pcxtest2.map index f24143ea..6dadd0ec 100755 --- 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/13 15:11:00 +Created on: 15/10/13 15:26:27 Executable Image: pcxtest2.exe creating a DOS executable @@ -68,8 +68,8 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(stk086.asm) 0000:0295* __STKOVERFLOW_ Module: gfx.lib(/dos/z/16/src/lib/modex16.c) 0000:89d4 VGAmodeX_ -0000:8a7e* modex__320x240_256__Enter_ -0000:8ade+ modex__256x192_256__Enter_ +0000:8a7e+ modex__320x240_256__Enter_ +0000:8ade* modex__256x192_256__Enter_ 0000:8b3e* modexLeave_ 0000:8b56+ modexsetBaseXMode_ 0000:8ba8 modexDefaultPage_ @@ -506,4 +506,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 0001a240 (107072.) Entry point address: 0000:02f8 -Link time: 00:00.89 +Link time: 00:00.91 diff --git a/scroll.exe b/scroll.exe index 832165a0..095b2d36 100755 Binary files a/scroll.exe and b/scroll.exe differ diff --git a/scroll.map b/scroll.map index f9316584..63d74d2d 100755 --- 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/13 15:11:00 +Created on: 15/10/13 15:26:27 Executable Image: scroll.exe creating a DOS executable @@ -243,8 +243,8 @@ Module: gfx.lib(/dos/z/16/src/lib/16text.c) 1a81:1140 _romFonts Module: gfx.lib(/dos/z/16/src/lib/modex16.c) 176a:01f4 VGAmodeX_ -176a:029e* modex__320x240_256__Enter_ -176a:02fe+ modex__256x192_256__Enter_ +176a:029e+ modex__320x240_256__Enter_ +176a:02fe* modex__256x192_256__Enter_ 176a:035e* modexLeave_ 176a:0376+ modexsetBaseXMode_ 176a:03c8 modexDefaultPage_ @@ -755,4 +755,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 0002a070 (172144.) Entry point address: 0990:027c -Link time: 00:00.67 +Link time: 00:00.86 diff --git a/src/lib/modex16.c b/src/lib/modex16.c index 2b489c2b..dc51ff39 100755 --- a/src/lib/modex16.c +++ b/src/lib/modex16.c @@ -56,8 +56,8 @@ void VGAmodeX(sword vq, global_game_variables_t *gv) int86(0x10, &in, &out); gv->old_mode = out.h.al; // enter mode - //modex__320x240_256__Enter(gv); - modex__256x192_256__Enter(gv); + modex__320x240_256__Enter(gv); + //modex__256x192_256__Enter(gv); } } diff --git a/test.exe b/test.exe index d7fb4efc..4221a9d2 100755 Binary files a/test.exe and b/test.exe differ diff --git a/test.map b/test.map index 860f324d..5790395e 100755 --- 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/13 15:11:00 +Created on: 15/10/13 15:26:27 Executable Image: test.exe creating a DOS executable @@ -64,8 +64,8 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(stk086.asm) 0000:0205* __STKOVERFLOW_ Module: gfx.lib(/dos/z/16/src/lib/modex16.c) 0000:5e14 VGAmodeX_ -0000:5ebe* modex__320x240_256__Enter_ -0000:5f1e+ modex__256x192_256__Enter_ +0000:5ebe+ modex__320x240_256__Enter_ +0000:5f1e* modex__256x192_256__Enter_ 0000:5f7e* modexLeave_ 0000:5f96+ modexsetBaseXMode_ 0000:5fe8 modexDefaultPage_ @@ -409,4 +409,4 @@ gfx.lib Stack size: dac0 (56000.) Memory size: 00016940 (92480.) Entry point address: 0000:0222 -Link time: 00:00.44 +Link time: 00:00.84 diff --git a/test2.exe b/test2.exe index 70befac6..76896112 100755 Binary files a/test2.exe and b/test2.exe differ diff --git a/test2.map b/test2.map index 0a1a3da9..a2a54ce7 100755 --- 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/13 15:11:00 +Created on: 15/10/13 15:26:27 Executable Image: test2.exe creating a DOS executable @@ -130,8 +130,8 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fgetc.c) 0000:0fa9 fgetc_ Module: gfx.lib(/dos/z/16/src/lib/modex16.c) 0000:69e4* VGAmodeX_ -0000:6a8e* modex__320x240_256__Enter_ -0000:6aee+ modex__256x192_256__Enter_ +0000:6a8e+ modex__320x240_256__Enter_ +0000:6aee* modex__256x192_256__Enter_ 0000:6b4e* modexLeave_ 0000:6b66+ modexsetBaseXMode_ 0000:6bb8* modexDefaultPage_ diff --git a/vgmtest.map b/vgmtest.map index 1a541c1a..ddb4a73d 100755 --- 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/13 15:11:00 +Created on: 15/10/13 15:26:27 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.50 +Link time: 00:00.26