From: sparky4 Date: Thu, 4 Aug 2016 13:45:17 +0000 (-0500) Subject: damn it! X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=3dfa7abc6ce33a83879aee99ebc6a354a915cc5f;p=plz.git damn it! --- diff --git a/asmyt.o b/asmyt.o new file mode 100755 index 0000000..b8751da Binary files /dev/null and b/asmyt.o differ diff --git a/copper.c b/copper.c index 80f4f2e..2b549f6 100755 --- a/copper.c +++ b/copper.c @@ -9,35 +9,5 @@ char far *cop_pal; static int dtau[66]; -int init_copper() -{ - int ccc; - - for (ccc = 0; ccc < 65; ccc++) { - dtau[ccc] = ccc * ccc / 4 * 43 / 128 + 60; - } - - return 0; -} - -int close_copper() -{ -__asm{ - mov bx,7 - mov ax,0 - mov cx,0 - mov dx,0 - int 0fcH - mov bx,7 - mov ax,1 - mov cx,0 - mov dx,0 - int 0fcH - mov bx,7 - mov ax,2 - mov cx,0 - mov dx,0 - int 0fcH -} - return 0; -} +extern int init_copper(); +extern int close_copper(); diff --git a/copper.lib b/copper.lib index 37ddb04..cf5aecc 100755 Binary files a/copper.lib and b/copper.lib differ diff --git a/copper.o b/copper.o new file mode 100755 index 0000000..89305e7 Binary files /dev/null and b/copper.o differ diff --git a/makefile b/makefile index adfd769..186b04b 100755 --- a/makefile +++ b/makefile @@ -92,8 +92,8 @@ copper.lib: copper.$(OBJ) wlib -b copper.lib copper.$(OBJ) copper.$(OBJ): copper.h copper.c copper.ass # wcl $(AFLAGS) -zcm=tasm -c copper.asm - wasm $(AFLAGS) -c copper.ass -# wcl $(FLAGS) -c copper.c +# wasm $(AFLAGS) -c copper.ass + wcl $(FLAGS) -c copper.c #tasm compiled... # copper.$(OBJ): copper.h copper.asm diff --git a/plz.c b/plz.c index 8925a9a..4ed8fcf 100755 --- a/plz.c +++ b/plz.c @@ -6,7 +6,7 @@ //#include "tweak.h" //#define DO_TABLES -//#define DPII (3.1415926535*2.0) +#define DPII (3.1415926535*2.0) #define LINELEN 41 #define MAXY 280 @@ -34,14 +34,14 @@ extern char far psini[16384]; extern int far lsini4[8192]; extern int far lsini16[8192]; -//int (* vmem)[LINELEN]=MK_FP(0x0a000,0); +int (* vmem)[LINELEN]=MK_FP(0x0a000,0); //char psini[16384]= -//#include "psini.pre" +//#include "psini.inc" //char lsini[16384]= -//#include "lsini.pre" +//#include "lsini.inc" char ptau[256]= -#include "ptau.pre" +#include "ptau.inc" int pals[6][768]; int curpal=0; diff --git a/plz.err b/plz.err new file mode 100755 index 0000000..6cf43e3 --- /dev/null +++ b/plz.err @@ -0,0 +1 @@ +ptau.inc(10): Warning! W138: No newline at end of file diff --git a/plz.o b/plz.o new file mode 100755 index 0000000..812d85e Binary files /dev/null and b/plz.o differ diff --git a/plzpart.map b/plzpart.map index bdf5af4..a7aef91 100755 --- a/plzpart.map +++ b/plzpart.map @@ -1,8 +1,7 @@ Open Watcom Linker Version 2.0 beta Feb 1 2016 01:01:49 (32-bit) Copyright (c) 2002-2016 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 16/08/04 08:26:09 -Warning! W1027: file copper.lib(/dos/z/plz/copper.ass): redefinition of _frame_count ignored +Created on: 16/08/04 08:44:52 Executable Image: plzpart.exe creating a DOS executable Error! E2028: init_copper_ is an undefined reference @@ -16,7 +15,7 @@ Error! E2028: close_copper_ is an undefined reference Group Address Size ===== ======= ==== -DGROUP 01b0:0000 0000aa40 +DGROUP 0117:0000 0000adf0 @@ -32,23 +31,24 @@ tweak_TEXT CODE AUTO 0000:0020 0000006d plz_TEXT CODE AUTO 0000:0090 00000a26 asmyt_TEXT CODE AUTO 0000:0ac0 000001ef _TEXT CODE AUTO 0000:0cb0 000004ae -copper_TEXT CODE AUTO 0000:115e 00000999 -FAR_DATA FAR_DATA AUTO 01af:0007 00000000 -_NULL BEGDATA DGROUP 01b0:0000 00000020 -_AFTERNULL BEGDATA DGROUP 01b2:0000 00000002 -CONST DATA DGROUP 01b2:0002 00000000 -CONST2 DATA DGROUP 01b2:0002 00000000 -_DATA DATA DGROUP 01b2:0002 000002c0 -XIB DATA DGROUP 01de:0002 00000000 -XI DATA DGROUP 01de:0002 00000006 -XIE DATA DGROUP 01de:0008 00000000 -YIB DATA DGROUP 01de:0008 00000000 -YI DATA DGROUP 01de:0008 00000000 -YIE DATA DGROUP 01de:0008 00000000 -STRINGS DATA DGROUP 01de:0008 00000000 -DATA DATA DGROUP 01de:0008 00000000 -_BSS BSS DGROUP 01de:0008 00002750 -STACK STACK DGROUP 0454:0000 00008000 +copper_TEXT CODE AUTO 0000:1160 00000000 +FAR_DATA FAR_DATA AUTO 0116:0000 00000000 +copper13_DATA FAR_DATA AUTO 0116:0000 00000006 +_NULL BEGDATA DGROUP 0117:0000 00000020 +_AFTERNULL BEGDATA DGROUP 0119:0000 00000002 +CONST DATA DGROUP 0119:0002 00000000 +CONST2 DATA DGROUP 0119:0002 00000000 +_DATA DATA DGROUP 011a:0000 000002c4 +XIB DATA DGROUP 0146:0004 00000000 +XI DATA DGROUP 0146:0004 00000006 +XIE DATA DGROUP 0146:000a 00000000 +YIB DATA DGROUP 0146:000a 00000000 +YI DATA DGROUP 0146:000a 00000000 +YIE DATA DGROUP 0146:000a 00000000 +STRINGS DATA DGROUP 0146:000a 00000000 +DATA DATA DGROUP 0146:000a 00000000 +_BSS BSS DGROUP 0147:0000 00002ae2 +STACK STACK DGROUP 03f6:0000 00008000 +----------------+ @@ -69,29 +69,30 @@ Module: tweak.o(/dos/z/plz/tweak.c) Module: plz.o(/dos/z/plz/plz.c) 0000:0090 plz_ 0000:0352+ init_plz_ -01b0:0022+ _ptau -01b0:0122+ _curpal -01b0:0124* _timetable -01b0:0138+ _ttptr -01b0:013a _l1 -01b0:013c _l2 -01b0:013e _l3 -01b0:0140 _l4 -01b0:0142 _k1 -01b0:0144 _k2 -01b0:0146 _k3 -01b0:0148 _k4 -01b0:014a _il1 -01b0:014c _il2 -01b0:014e _il3 -01b0:0150 _il4 -01b0:0152 _ik1 -01b0:0154 _ik2 -01b0:0156 _ik3 -01b0:0158 _ik4 -01b0:015a+ _inittable -01b0:02e8+ _pals -01b0:26e8+ _frame_count +0117:0030* _vmem +0117:0034+ _ptau +0117:0134+ _curpal +0117:0136* _timetable +0117:014a+ _ttptr +0117:014c+ _l1 +0117:014e+ _l2 +0117:0150+ _l3 +0117:0152+ _l4 +0117:0154+ _k1 +0117:0156+ _k2 +0117:0158+ _k3 +0117:015a+ _k4 +0117:015c+ _il1 +0117:015e+ _il2 +0117:0160+ _il3 +0117:0162+ _il4 +0117:0164+ _ik1 +0117:0166+ _ik2 +0117:0168+ _ik3 +0117:016a+ _ik4 +0117:016c+ _inittable +0117:0300+ _pals +0117:2700+ _frame_count Module: asmyt.o(/dos/z/plz/asmyt.c) 0000:0ac0 plzline_ 0000:0b3a setplzparas_ @@ -100,10 +101,10 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(stk086.asm) 0000:0cb5 __STK 0000:0cd5* __STKOVERFLOW_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(cstart) -01b0:0000* __nullarea -01b0:02a4* __ovlflag -01b0:02a5* __intno -01b0:02a6* __ovlvec +0117:0000* __nullarea +0117:02b6* __ovlflag +0117:02b7* __intno +0117:02b8* __ovlvec 0000:0cf2 _cstart_ 0000:0dc5* _Not_Enough_Memory_ 0000:0ef7 __exit_ @@ -112,19 +113,13 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(cstart) Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(cmodel.asm) 0000:0f78 _big_code_ 0000:0f78* CodeModelMismatch -Module: copper.lib(/dos/z/plz/copper.ass) -0000:1160 _cop_drop -0000:1162* _cop_pal -0000:1166* _do_pal -0000:1168 _cop_start -0000:116a* _cop_scrl -0000:116c _cop_plz -0000:116e* _close_copper -0000:1199* _init_copper -0000:1239* _pompota -0000:1267* _moveplz -0000:1343 _fadepal -0000:1943 _cop_fadepal +Module: copper.lib(/dos/z/plz/copper.c) +0117:2a50 _fadepal +0117:2d50 _cop_fadepal +0117:2dd8* _cop_pal +0116:0000 _cop_plz +0116:0002 _cop_drop +0116:0004 _cop_start Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(i4m.asm) 0000:0f78 __I4M 0000:0f78* __U4M @@ -137,23 +132,23 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(xmsg.c) 0000:0fc5* __exit_with_msg_ 0000:0fca __fatal_runtime_error_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(crwdata) -01b0:02aa __curbrk -01b0:02b2 __STACKLOW -01b0:02b4 __STACKTOP -01b0:02b6 __cbyte -01b0:02b8 __child -01b0:02ba __no87 -01b0:02c7 ___FPE_handler -01b0:02ac __psp -01b0:02bb __get_ovl_stack -01b0:02bf __restore_ovl_stack -01b0:02c3 __close_ovl_file -01b0:02cb __LpCmdLine -01b0:02cf __LpPgmName -01b0:02ae __osmajor -01b0:02af __osminor -01b0:02b0 __osmode -01b0:02b1 __HShift +0117:02bc __curbrk +0117:02c4 __STACKLOW +0117:02c6 __STACKTOP +0117:02c8 __cbyte +0117:02ca __child +0117:02cc __no87 +0117:02d9 ___FPE_handler +0117:02be __psp +0117:02cd __get_ovl_stack +0117:02d1 __restore_ovl_stack +0117:02d5 __close_ovl_file +0117:02dd __LpCmdLine +0117:02e1 __LpPgmName +0117:02c0 __osmajor +0117:02c1 __osminor +0117:02c2 __osmode +0117:02c3 __HShift Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(cmain086.c) 0000:0fe4 __CMain Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(initrtns.c) @@ -162,28 +157,28 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(initrtns.c) 0000:10a0 __FiniRtns 0000:10a0* __FFiniRtns Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(uselfn.c) -01b0:02d4 ___uselfn +0117:02e6 ___uselfn Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(dosseg) 0000:1104 __DOSseg__ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(enterdb.c) 0000:1105 __EnterWVIDEO_ -01b0:02d6+ ___WD_Present +0117:02e8+ ___WD_Present Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(___argc.c) -01b0:2a32 ____Argv -01b0:2a36 ____Argc +0117:2ddc ____Argv +0117:2de0 ____Argc Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(amblksiz.c) -01b0:02d8 __amblksiz +0117:02ea __amblksiz Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(exit.c) 0000:1129+ __null_int23_exit_ 0000:112a exit_ 0000:1142* _exit_ -01b0:02da+ ___int23_exit -01b0:02de+ ___FPE_handler_exit +0117:02ec+ ___int23_exit +0117:02f0+ ___FPE_handler_exit Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(sgdef086) -01b0:02e2 __Start_XI -01b0:02e8 __End_XI -01b0:02e8 __Start_YI -01b0:02e8 __End_YI +0117:02f4 __Start_XI +0117:02fa __End_XI +0117:02fa __Start_YI +0117:02fa __End_YI +---------------------------+ diff --git a/plzpart.o b/plzpart.o new file mode 100755 index 0000000..bd6a698 Binary files /dev/null and b/plzpart.o differ diff --git a/ptau.pre b/ptau.pre deleted file mode 100755 index daf5b1d..0000000 --- a/ptau.pre +++ /dev/null @@ -1,10 +0,0 @@ -{ -0, 1, 1, 1, 1, 1, 2, 2, 3, 3, 4, 5, 6, 7, 8, 9, 10 -, 11, 12, 13, 14, 16, 17, 18, 20, 21, 23, 24, 25, 27, 28, 30, 31 -, 33, 35, 36, 38, 39, 40, 42, 43, 45, 46, 47, 49, 50, 51, 52, 53 -, 54, 55, 56, 57, 58, 59, 60, 60, 61, 61, 62, 62, 62, 62, 62, 63 -, 62, 62, 62, 62, 62, 61, 61, 60, 60, 59, 58, 57, 56, 55, 54, 53 -, 52, 51, 50, 49, 47, 46, 45, 43, 42, 40, 39, 38, 36, 35, 33, 32 -, 30, 28, 27, 25, 24, 23, 21, 20, 18, 17, 16, 14, 13, 12, 11, 10 -, 9, 8, 7, 6, 5, 4, 3, 3, 2, 2, 1, 1, 1, 1, 1, 1 -}; diff --git a/tweak.o b/tweak.o new file mode 100755 index 0000000..cc84575 Binary files /dev/null and b/tweak.o differ