From: sparky4 Date: Tue, 29 Sep 2015 19:50:48 +0000 (-0500) Subject: wwww X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=0910c3436fc82a593163cdb1525092b84eb85479;p=16.git wwww modified: 16.map modified: bakapi.map modified: exmmtest.map modified: fmemtest.map modified: fontgfx.map modified: inputest.map modified: maptest.map modified: palettec.map modified: pcxtest.map modified: pcxtest2.map modified: scroll.exe modified: scroll.map modified: src/lib/modex16.c modified: src/lib/modex16.h modified: src/scroll.c modified: test.map modified: test2.map --- diff --git a/16.map b/16.map index f4beef1f..9ef2280b 100755 --- a/16.map +++ b/16.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (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/29 14:45:32 +Created on: 15/09/29 14:50:47 Executable Image: 16.exe creating a DOS executable @@ -87,7 +87,7 @@ Module: 16.lib(/dos/z/16/src/lib/modex16.c) 0000:7d0c* modexLeave_ 0000:7d24* modexDefaultPage_ 0000:7d7e* modexNextPage_ -0000:7e3a* modexNextPage0_ +0000:7e3a* modexNextPageAppend_ 0000:7ede* modexShowPage_ 0000:7fda* modexPanPage_ 0000:802a* modexSelectPlane_ diff --git a/bakapi.map b/bakapi.map index 616f1249..eb7e3c36 100755 --- a/bakapi.map +++ b/bakapi.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (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/29 14:45:32 +Created on: 15/09/29 14:50:47 Executable Image: bakapi.exe creating a DOS executable @@ -74,7 +74,7 @@ Module: 16.lib(/dos/z/16/src/lib/modex16.c) 0000:7e5c* modexLeave_ 0000:7e74 modexDefaultPage_ 0000:7ece* modexNextPage_ -0000:7f8a* modexNextPage0_ +0000:7f8a* modexNextPageAppend_ 0000:802e modexShowPage_ 0000:812a* modexPanPage_ 0000:817a* modexSelectPlane_ diff --git a/exmmtest.map b/exmmtest.map index 83508ebf..f301002e 100755 --- a/exmmtest.map +++ b/exmmtest.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (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/29 14:45:32 +Created on: 15/09/29 14:50:47 Executable Image: exmmtest.exe creating a DOS executable diff --git a/fmemtest.map b/fmemtest.map index 4149c10f..cf2982c6 100755 --- a/fmemtest.map +++ b/fmemtest.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (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/29 14:45:32 +Created on: 15/09/29 14:50:47 Executable Image: fmemtest.exe creating a DOS executable diff --git a/fontgfx.map b/fontgfx.map index 57dd2fb9..6fe410f1 100755 --- a/fontgfx.map +++ b/fontgfx.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (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/29 14:45:32 +Created on: 15/09/29 14:50:47 Executable Image: fontgfx.exe creating a DOS executable @@ -70,7 +70,7 @@ Module: 16.lib(/dos/z/16/src/lib/modex16.c) 0000:640c modexLeave_ 0000:6424 modexDefaultPage_ 0000:647e* modexNextPage_ -0000:653a* modexNextPage0_ +0000:653a* modexNextPageAppend_ 0000:65de* modexShowPage_ 0000:66da* modexPanPage_ 0000:672a* modexSelectPlane_ diff --git a/inputest.map b/inputest.map index 272d20ff..e57dba3a 100755 --- a/inputest.map +++ b/inputest.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (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/29 14:45:32 +Created on: 15/09/29 14:50:47 Executable Image: inputest.exe creating a DOS executable diff --git a/maptest.map b/maptest.map index 570eaa3b..f8be4c19 100755 --- a/maptest.map +++ b/maptest.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (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/29 14:45:32 +Created on: 15/09/29 14:50:47 Executable Image: maptest.exe creating a DOS executable @@ -216,7 +216,7 @@ Module: 16.lib(/dos/z/16/src/lib/modex16.c) 0000:7fdc* modexLeave_ 0000:7ff4* modexDefaultPage_ 0000:804e* modexNextPage_ -0000:810a* modexNextPage0_ +0000:810a* modexNextPageAppend_ 0000:81ae* modexShowPage_ 0000:82aa* modexPanPage_ 0000:82fa* modexSelectPlane_ diff --git a/palettec.map b/palettec.map index 0380ad71..f0abdf82 100755 --- a/palettec.map +++ b/palettec.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (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/29 14:45:32 +Created on: 15/09/29 14:50:47 Executable Image: palettec.exe creating a DOS executable @@ -67,7 +67,7 @@ Module: 16.lib(/dos/z/16/src/lib/modex16.c) 0000:5d8c modexLeave_ 0000:5da4* modexDefaultPage_ 0000:5dfe* modexNextPage_ -0000:5eba* modexNextPage0_ +0000:5eba* modexNextPageAppend_ 0000:5f5e* modexShowPage_ 0000:605a* modexPanPage_ 0000:60aa* modexSelectPlane_ diff --git a/pcxtest.map b/pcxtest.map index d25a6905..125686d3 100755 --- a/pcxtest.map +++ b/pcxtest.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (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/29 14:45:32 +Created on: 15/09/29 14:50:47 Executable Image: pcxtest.exe creating a DOS executable @@ -72,7 +72,7 @@ Module: gfx.lib(/dos/z/16/src/lib/modex16.c) 0000:8a7c modexLeave_ 0000:8a94 modexDefaultPage_ 0000:8aee* modexNextPage_ -0000:8baa* modexNextPage0_ +0000:8baa* modexNextPageAppend_ 0000:8c4e* modexShowPage_ 0000:8d4a* modexPanPage_ 0000:8d9a* modexSelectPlane_ diff --git a/pcxtest2.map b/pcxtest2.map index d91f3b71..532a44b3 100755 --- a/pcxtest2.map +++ b/pcxtest2.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (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/29 14:45:32 +Created on: 15/09/29 14:50:47 Executable Image: pcxtest2.exe creating a DOS executable @@ -72,7 +72,7 @@ Module: gfx.lib(/dos/z/16/src/lib/modex16.c) 0000:8a7c modexLeave_ 0000:8a94 modexDefaultPage_ 0000:8aee* modexNextPage_ -0000:8baa* modexNextPage0_ +0000:8baa* modexNextPageAppend_ 0000:8c4e* modexShowPage_ 0000:8d4a* modexPanPage_ 0000:8d9a* modexSelectPlane_ diff --git a/scroll.exe b/scroll.exe index 65275b30..f1e8822d 100755 Binary files a/scroll.exe and b/scroll.exe differ diff --git a/scroll.map b/scroll.map index 436395b7..cab0da6e 100755 --- a/scroll.map +++ b/scroll.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (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/29 14:45:32 +Created on: 15/09/29 14:50:47 Executable Image: scroll.exe creating a DOS executable @@ -160,7 +160,7 @@ Module: 16.lib(/dos/z/16/src/lib/modex16.c) 0e13:02fc* modexLeave_ 0e13:0314 modexDefaultPage_ 0e13:036e modexNextPage_ -0e13:042a modexNextPage0_ +0e13:042a modexNextPageAppend_ 0e13:04ce modexShowPage_ 0e13:05ca* modexPanPage_ 0e13:061a* modexSelectPlane_ diff --git a/src/lib/modex16.c b/src/lib/modex16.c index eaf9966c..fc9281e3 100755 --- a/src/lib/modex16.c +++ b/src/lib/modex16.c @@ -163,7 +163,7 @@ modexNextPage(page_t *p) { //next page with defined dimentions~ page_t -modexNextPage0(page_t *p, word x, word y) +modexNextPageAppend(page_t *p, word x, word y) { page_t result; diff --git a/src/lib/modex16.h b/src/lib/modex16.h index 41b67de2..5d88e618 100755 --- a/src/lib/modex16.h +++ b/src/lib/modex16.h @@ -60,7 +60,7 @@ void modexEnter(); void modexLeave(); page_t modexDefaultPage(); page_t modexNextPage(page_t *p); -page_t modexNextPage0(page_t *p, word x, word y); +page_t modexNextPageAppend(page_t *p, word x, word y); void modexShowPage(page_t *page); void modexPanPage(page_t *page, int dx, int dy); void modexSelectPlane(byte plane); diff --git a/src/scroll.c b/src/scroll.c index 8642d83b..4306973a 100755 --- a/src/scroll.c +++ b/src/scroll.c @@ -134,7 +134,7 @@ void main() mv[0].page = &screen; screen2 = modexNextPage(mv[0].page); mv[1].page = &screen2; - screen3 = modexNextPage0(mv[1].page, 320, 240); //(352*176)+1024 is the remaining amount of memory left wwww + screen3 = modexNextPageAppend(mv[1].page, 320, 240); //(352*176)+1024 is the remaining amount of memory left wwww //screen3 = modexNextPage0(mv2.page, 320, 192); //(352*176)+1024 is the remaining amount of memory left wwww mv[2].page = &screen3; diff --git a/test.map b/test.map index 713a26fe..7b0e1ff9 100755 --- a/test.map +++ b/test.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (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/29 14:45:32 +Created on: 15/09/29 14:50:47 Executable Image: test.exe creating a DOS executable @@ -68,7 +68,7 @@ Module: gfx.lib(/dos/z/16/src/lib/modex16.c) 0000:5ecc modexLeave_ 0000:5ee4 modexDefaultPage_ 0000:5f3e modexNextPage_ -0000:5ffa* modexNextPage0_ +0000:5ffa* modexNextPageAppend_ 0000:609e modexShowPage_ 0000:619a* modexPanPage_ 0000:61ea* modexSelectPlane_ diff --git a/test2.map b/test2.map index 0c0a45a2..cc231029 100755 --- a/test2.map +++ b/test2.map @@ -1,7 +1,7 @@ Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (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/29 14:45:32 +Created on: 15/09/29 14:50:47 Executable Image: test2.exe creating a DOS executable @@ -135,7 +135,7 @@ Module: gfx.lib(/dos/z/16/src/lib/modex16.c) 0000:6a7c* modexLeave_ 0000:6a94* modexDefaultPage_ 0000:6aee* modexNextPage_ -0000:6baa* modexNextPage0_ +0000:6baa* modexNextPageAppend_ 0000:6c4e* modexShowPage_ 0000:6d4a* modexPanPage_ 0000:6d9a* modexSelectPlane_