From 2f1eeec31951744f38a172b730340610330ad754 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Wed, 29 Mar 2017 11:36:11 -0500 Subject: [PATCH] [16_ca needs huge amounts of work and I should remember what needs to be done soon][OpenVGMFile needs to be ported to 16_snd.c]going to port rest of code to borland c some time so we can use the core components of id engine here [going to add 16_us.c eventually but the debug system and CA_ PM_ and MM_ usage is priority now] added animation delay test back wwww [older zcroll renamed to xcroll][zcroll is now the pre menu game loop system with PROPER data usage with CAMMPM] --- 16/wf3d8086/.id_ca.c.kate-swp | Bin 0 -> 44 bytes makefile | 31 +++++++++++++++++-------------- src/16.c | 6 +++--- src/exmmtest.c | 2 +- src/lib/16_dbg.c | 4 +--- src/lib/16_dbg.h | 2 +- src/{zcroll.c => xcroll.c} | 0 7 files changed, 23 insertions(+), 22 deletions(-) create mode 100755 16/wf3d8086/.id_ca.c.kate-swp rename src/{zcroll.c => xcroll.c} (100%) diff --git a/16/wf3d8086/.id_ca.c.kate-swp b/16/wf3d8086/.id_ca.c.kate-swp new file mode 100755 index 0000000000000000000000000000000000000000..ed0e0fcc1f273793fa6d433be772456d4a374833 GIT binary patch literal 44 zcmZQzU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?Vn*!-C3nPimO_3IntHy7Nk-x}-+01}xG A6951J literal 0 HcmV?d00001 diff --git a/makefile b/makefile index ea59beda..3e73a7cb 100755 --- a/makefile +++ b/makefile @@ -192,10 +192,11 @@ TESTEXEC = & 0.exe & exmmtest.exe & vgmtest.exe & - zcroll.exe & + xcroll.exe & inputest.exe & vrstest.exe & maptest.exe +#zcroll.exe & TESTEXEC2 = & pcxtest.exe & scroll.exe & @@ -248,6 +249,8 @@ bakapi.exe: bakapi.$(OBJ) gfx.lib $(DOSLIB) # scroll.exe: scroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIB) scroll.$(OBJ): $(SRC)/scroll.c +xcroll.exe: xcroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIB) +xcroll.$(OBJ): $(SRC)/xcroll.c zcroll.exe: zcroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIB) zcroll.$(OBJ): $(SRC)/zcroll.c tesuto.exe: tesuto.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIB) @@ -382,8 +385,8 @@ ll.$(OBJ): $(SRCLIB)/ll.c $(SRCLIB)/ll.h #other~ # clean: .symbolic - @if not exist $(DOSLIBDIR)/buildall.sh wmake -h initlibs - @wmake -h initscript + @if not exist $(DOSLIBDIR)/buildall.sh wmake -s -h initlibs + @wmake -s -h initscript @for %f in ($(ALLEXEC)) do @if exist %f $(REMOVECOMMAND) %f !ifdef __LINUX__ @if exist *.LIB $(REMOVECOMMAND) *.LIB @@ -391,7 +394,7 @@ clean: .symbolic @if exist *.EXE $(REMOVECOMMAND) *.EXE @if exist *.OBJ $(REMOVECOMMAND) *.OBJ #@for %f in ($(SPRIUTILEXEC)) do @if exist %f $(REMOVECOMMAND) %f - @if not exist vrl2vrs wmake -h pcx2vrl + @if not exist vrl2vrs wmake -s -h pcx2vrl !else @if exist *.o $(REMOVECOMMAND) *.o !endif @@ -470,11 +473,11 @@ www: .symbolic @for %f in ($(EXEC)) do @if exist %f @$(COPYCOMMAND) %f /var/www/ @./src/util/z.sh $(EXEC) $(EXEC) @./src/util/z2.sh data.zip data - @wmake -h wwwext + @wmake -s -h wwwext wwwext: .symbolic - @wmake -h wwwext1 - @wmake -h wwwext2 + @wmake -s -h wwwext1 + @wmake -s -h wwwext2 wwwext1: .symbolic ####----@ssh -p $(HOSTPORT) $(HOSTUSER)@$(HOSTADDR) 'rm -f $(HOSTDIR)/16/*exe*' @@ -529,11 +532,11 @@ reinitlibs: .symbolic @$(REMOVECOMMAND) -rf 16/wolf3d @$(REMOVECOMMAND) -rf 16/keen @$(REMOVECOMMAND) -rf 16/Catacomb3D - @wmake -h initlibs + @wmake -s -h initlibs initlibs: .symbolic - @wmake -h initconfig - @wmake -h getlib + @wmake -s -h initconfig + @wmake -s -h getlib @cd 16 @git clone https://github.com/FlatRockSoft/CatacombApocalypse.git @git clone https://github.com/id-Software/wolf3d.git @@ -553,19 +556,19 @@ getlib: .symbolic ## xlib: .symbolic @cd 16$(DIRSEP)xlib - @wmake -h clean - @wmake -h all + @wmake -s -h clean + @wmake -s -h all @cd $(BUILD_ROOT) mx: .symbolic @cd 16$(DIRSEP)xw # @wmake clean - @wmake -h all + @wmake -s -h all @cd $(BUILD_ROOT) mx_: .symbolic @cd 16$(DIRSEP)xw_ - @wmake -h -f makefile all + @wmake -s -h -f makefile all @cd $(BUILD_ROOT) !ifdef __LINUX__ diff --git a/src/16.c b/src/16.c index e87446c6..9d05514f 100755 --- a/src/16.c +++ b/src/16.c @@ -26,7 +26,7 @@ void main(int argc, char *argv[]) { static global_game_variables_t gvar; - Startup16(&gvar); + Startup16(&gvar);//initgame equ /* save the palette */ modexPalSave(gvar.video.dpal); @@ -52,8 +52,8 @@ main(int argc, char *argv[]) modexFadeOn(4, gvar.video.dpal); // InitGame ();//to be defined in 16_tail -// DemoLoop();//to be defined in 16_tail +//++++ DemoLoop();//to be defined in 16_tail -// Quit("Demo loop exited???"); +//++++ Quit("Demo loop exited???"); } diff --git a/src/exmmtest.c b/src/exmmtest.c index 11cdf7cf..bc10fe29 100755 --- a/src/exmmtest.c +++ b/src/exmmtest.c @@ -226,7 +226,7 @@ PRINTBB; printf("\n\npress any key to continue!\n"); getch(); #ifdef __WATCOMC__ IN_Startup(&gvar); - ShapeTest (&gvar); + ShapeTest_(&gvar); IN_Shutdown(&gvar); #endif diff --git a/src/lib/16_dbg.c b/src/lib/16_dbg.c index 8fa25c3f..fff20c22 100755 --- a/src/lib/16_dbg.c +++ b/src/lib/16_dbg.c @@ -108,7 +108,7 @@ void _DEBUGF(const char *fmt,...) { */ #pragma warn -pia -void ShapeTest (global_game_variables_t *gvar) +void ShapeTest_(global_game_variables_t *gvar) { extern word NumDigi; extern word _seg *DigiList; @@ -266,8 +266,6 @@ static char buf[10]; {} // SD_Poll(); -//if(IN_KeyDown(sc_Escape)) break; - IN_ClearKey(scan); switch (scan) { diff --git a/src/lib/16_dbg.h b/src/lib/16_dbg.h index a4a01843..6903aa57 100755 --- a/src/lib/16_dbg.h +++ b/src/lib/16_dbg.h @@ -64,6 +64,6 @@ static inline int _DEBUG_INIT() { # endif #endif //watcomc -void ShapeTest (global_game_variables_t *gvar); +void ShapeTest_(global_game_variables_t *gvar); #endif // _SRC_LIB_16_DBG diff --git a/src/zcroll.c b/src/xcroll.c similarity index 100% rename from src/zcroll.c rename to src/xcroll.c -- 2.39.2