From: sparky4 Date: Sat, 3 Oct 2015 21:43:03 +0000 (-0500) Subject: poke X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=0c93b2c4daed4fcbaecf294775b293671f54d823;p=16.git poke --- diff --git a/16.exe b/16.exe index ccf3303a..ffa42f55 100755 Binary files a/16.exe and b/16.exe differ diff --git a/16.map b/16.map index af8f3e61..98ad0c06 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/10/03 14:56:12 +Created on: 15/10/03 16:42:51 Executable Image: 16.exe creating a DOS executable diff --git a/bakapi.map b/bakapi.map index efe2ce07..66d18373 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/10/03 14:56:12 +Created on: 15/10/03 16:42:51 Executable Image: bakapi.exe creating a DOS executable diff --git a/exmmtest.map b/exmmtest.map index 234ccdb0..c82af900 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/10/03 14:56:12 +Created on: 15/10/03 16:42:51 Executable Image: exmmtest.exe creating a DOS executable diff --git a/fmemtest.map b/fmemtest.map index 40815652..fdc3fb60 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/10/03 14:56:12 +Created on: 15/10/03 16:42:51 Executable Image: fmemtest.exe creating a DOS executable diff --git a/fontgfx.map b/fontgfx.map index a28543f6..e8841c14 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/10/03 14:56:12 +Created on: 15/10/03 16:42:51 Executable Image: fontgfx.exe creating a DOS executable diff --git a/fonttest.map b/fonttest.map index 985d60e4..e59a7c04 100755 --- a/fonttest.map +++ b/fonttest.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/10/03 14:56:12 +Created on: 15/10/03 16:42:51 Executable Image: fonttest.exe creating a DOS executable diff --git a/inputest.map b/inputest.map index e98456a5..02eb7eef 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/10/03 14:56:12 +Created on: 15/10/03 16:42:51 Executable Image: inputest.exe creating a DOS executable diff --git a/makefile b/makefile index 2aca190b..3187305b 100755 --- a/makefile +++ b/makefile @@ -364,7 +364,7 @@ clean: .symbolic # @echo $(INCLUDE) comp: .symbolic - upx -9 -qqq $(EXEC) + @upx -9 -qqq $(EXEC) updatelibs: .symbolic cd $(JSMNLIB) diff --git a/maptest.map b/maptest.map index 4f464507..f47226ac 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/10/03 14:56:12 +Created on: 15/10/03 16:42:51 Executable Image: maptest.exe creating a DOS executable diff --git a/palettec.map b/palettec.map index b9a3f8f3..38da0a9d 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/10/03 14:56:12 +Created on: 15/10/03 16:42:51 Executable Image: palettec.exe creating a DOS executable diff --git a/pcxtest.map b/pcxtest.map index e2e43862..ad03134b 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/10/03 14:56:12 +Created on: 15/10/03 16:42:51 Executable Image: pcxtest.exe creating a DOS executable diff --git a/pcxtest2.map b/pcxtest2.map index ab9c8865..1288bb5b 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/10/03 14:56:12 +Created on: 15/10/03 16:42:51 Executable Image: pcxtest2.exe creating a DOS executable diff --git a/scroll.exe b/scroll.exe index 4005c18f..ee90cef1 100755 Binary files a/scroll.exe and b/scroll.exe differ diff --git a/scroll.map b/scroll.map index 2dc38467..2a054a49 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/10/03 14:56:12 +Created on: 15/10/03 16:42:51 Executable Image: scroll.exe creating a DOS executable @@ -36,7 +36,7 @@ kitten_TEXT CODE AUTO 0000:7840 0000080a 16_hc_TEXT CODE AUTO 0000:8050 0000158b timer_TEXT CODE AUTO 0000:95e0 00000209 _TEXT CODE AUTO 097f:0000 00009f29 -scroll16_TEXT CODE AUTO 097f:9f30 00003471 +scroll16_TEXT CODE AUTO 097f:9f30 00003475 bitmap_TEXT CODE AUTO 097f:d3b0 000005c9 planar_TEXT CODE AUTO 097f:d980 00000275 16text_TEXT CODE AUTO 097f:dc00 0000010d @@ -230,7 +230,7 @@ Module: gfx.lib(/dos/z/16/src/lib/scroll16.c) 097f:cd32+ mapDrawWRow_ 097f:ce60* mapDrawWCol_ 097f:cfaa shinku_ -097f:d11c+ animatePlayer_ +097f:d120+ animatePlayer_ Module: gfx.lib(/dos/z/16/src/lib/bitmap.c) 097f:d6b2 bitmapLoadPcx_ 097f:d80e* bitmapLoadPcxTiles_ diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c index 59fab847..f0fb6d34 100755 --- a/src/lib/scroll16.c +++ b/src/lib/scroll16.c @@ -595,7 +595,7 @@ void shinku(page_t *page, global_game_variables_t *gv) word col = 15; word bgcol = 0; word type = 1; - pee = _fmalloc(sizeof(byte)*2); + pee = _nmalloc(sizeof(byte)*2); //t=(((*(gv->clock))-gv->clock_start) /18.2); sprintf(pee, "%f fps", (double)gv->kurokku.tiku/ticktock(gv)); modexprint(page, 16, 16, 1, 15, 0, pee); diff --git a/test.map b/test.map index 76289900..ea8a1a84 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/10/03 14:56:12 +Created on: 15/10/03 16:42:51 Executable Image: test.exe creating a DOS executable diff --git a/test2.map b/test2.map index b9dfa2fc..bf327dcf 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/10/03 14:56:12 +Created on: 15/10/03 16:42:51 Executable Image: test2.exe creating a DOS executable diff --git a/vgmtest.map b/vgmtest.map index 5f6d1122..c7acd8b2 100755 --- a/vgmtest.map +++ b/vgmtest.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/10/03 14:56:12 +Created on: 15/10/03 16:42:51 Executable Image: vgmtest.exe creating a DOS executable