From 0cb0d7318ce5253197b6554553340ab1b2286417 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Mon, 15 Feb 2016 11:30:31 -0600 Subject: [PATCH] wwww --- asmyt.c | 17 +++++++++++++++++ asmyt.h | 6 ++++-- makefile | 2 ++ plz.c | 10 +++++----- plz.err | 6 ------ plz.h | 3 ++- plz.o | Bin 5280 -> 5309 bytes plzpart.map | 6 +++--- 8 files changed, 33 insertions(+), 17 deletions(-) create mode 100755 asmyt.c delete mode 100755 plz.err diff --git a/asmyt.c b/asmyt.c new file mode 100755 index 0000000..d906446 --- /dev/null +++ b/asmyt.c @@ -0,0 +1,17 @@ +#include "asmyt.h" +void set_plzstart(word start) +{ +__asm{ + mov dx, 3d4h + mov al, 18h ; linecompare + mov ah, [Byte start] + out dx, ax + mov al, 07h + mov ah, [Byte start+1] + shl ah, 4d + and ah, 10h + or ah, 0fh + out dx, ax ; 8th bit +} + return start; +} diff --git a/asmyt.h b/asmyt.h index dc4a31f..643ce9b 100755 --- a/asmyt.h +++ b/asmyt.h @@ -1,5 +1,7 @@ #ifndef _ASMYT_H_ #define _ASMYT_H_ -int plzline(); - +#include "types.h" +int plzline(int y, int vseg); +int setplzparas(int c1, int c2, int c3, int c4); +word set_plzstart(word start); #endif diff --git a/makefile b/makefile index a9adedd..88853bb 100755 --- a/makefile +++ b/makefile @@ -87,6 +87,8 @@ plz.$(OBJ): plz.h plz.c wcl $(FLAGS) -c plz.c tweak.$(OBJ): tweak.h tweak.c wcl $(FLAGS) -c tweak.c +asmyt.$(OBJ): asmyt.h asmyt.c + wcl $(FLAGS) -c asmyt.c #tasm compiled... copper.$(OBJ): copper.h copper.asm wcl $(AFLAGS) -zcm=tasm -c copper.asm diff --git a/plz.c b/plz.c index b25327e..fd7c735 100755 --- a/plz.c +++ b/plz.c @@ -26,9 +26,9 @@ extern char fadepal[768]; extern char far *cop_pal; extern int do_pal; -extern int plzline(int y, int vseg); -extern int setplzparas(int c1, int c2, int c3, int c4); -extern int set_plzstart(int y); +//extern int plzline(int y, int vseg); +//extern int setplzparas(int c1, int c2, int c3, int c4); +//extern int set_plzstart(int y); extern char far psini[16384]; extern int far lsini4[8192]; extern int far lsini16[8192]; @@ -71,7 +71,7 @@ void plz(){ init_plz(); cop_drop=128; - cop_fadepal=pals[curpal++]; + cop_fadepal=(char far *)pals[curpal++]; frame_count=0; while(!kbhit()) @@ -81,7 +81,7 @@ void plz(){ // { memset(fadepal,0,768); cop_drop=1; - cop_fadepal=pals[curpal++]; + cop_fadepal=(char far *)pals[curpal++]; ttptr++; il1=inittable[ttptr][0]; il2=inittable[ttptr][1]; diff --git a/plz.err b/plz.err deleted file mode 100755 index 2180aa2..0000000 --- a/plz.err +++ /dev/null @@ -1,6 +0,0 @@ -plz.c(74): Warning! W113: Pointer type mismatch -plz.c(74): Note! I2003: source conversion type is 'int *' -plz.c(74): Note! I2004: target conversion type is 'char __far *' -plz.c(84): Warning! W113: Pointer type mismatch -plz.c(84): Note! I2003: source conversion type is 'int *' -plz.c(84): Note! I2004: target conversion type is 'char __far *' diff --git a/plz.h b/plz.h index 339343b..7f8ee3d 100755 --- a/plz.h +++ b/plz.h @@ -4,10 +4,11 @@ #include "asmyt.h" #include "copper.h" #include "tweak.h" +#include "types.h" extern setplzparas(); extern int plzline(); // extern void tw_opengraph2(); -extern int set_plzstart(); +//extern int // extern void tw_setrgbpalette(); void init_plz(); diff --git a/plz.o b/plz.o index 2ede624bd70cddebf76432d5c6f0cc74a41fce15..990572c7e6ce91aa42e42c6682caed3a27ebdf2e 100755 GIT binary patch delta 172 zcmZ3WxmR<7cKxnse-8oul>B1-D*b{SFxE?M>X2Y)csUD;RL0y6DWFsmP)Z0%S7LE) zWr<$KPq1W96slxNWkG7OUdG7|X`s%nGkraT5jrRKa?0^y*HxaHn5~!bXycYQ!T_}2 BK|BBe delta 149 zcmdn1xj=J*cKxjge-8oul>B1-D*b{SFxE>>?T}z-c-ezRDq~%T6i}+P#MeUzNmpWV zZe@vH#`z9upk&KjUk_m<$>jWkg480t3@fnK13*&|TDhw9OUhFdv-L7IY`pkJ7ywHP BIBWm_ diff --git a/plzpart.map b/plzpart.map index 691b859..00982a4 100755 --- a/plzpart.map +++ b/plzpart.map @@ -1,7 +1,7 @@ -Open Watcom Linker Version 2.0 beta Jan 16 2016 17:32:38 (64-bit) -Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved. +Open Watcom Linker Version 2.0 beta Jan 20 2016 10:21:07 (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/02/15 11:08:20 +Created on: 16/02/15 11:29:55 Executable Image: plzpart.exe creating a DOS executable Error! E2028: init_copper_ is an undefined reference -- 2.39.2