[16_ca needs huge amounts of work and I should remember what needs to be done soon...

diff --git a/16/wf3d8086/.id_ca.c.kate-swp b/16/wf3d8086/.id_ca.c.kate-swp
new file mode 100755 (executable)
index 0000000..ed0e0fc
Binary files /dev/null and b/16/wf3d8086/.id_ca.c.kate-swp differ

diff --git a/makefile b/makefile
index ea59beda3f4b612007b207bebb8c5acb52d5748b..3e73a7cb84649237ff8787bbe2269cdfd78c4afe 100755 (executable)
--- 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 e87446c6378f1192920ec09c11ff0c2b05db0f5e..9d05514f01baafae30249e95acf26090ed900143 100755 (executable)
--- a/src/16.c
+++ b/src/16.c
@@ -26,7 +26,7 @@ void
 main(int argc, char *argv[])\r
 {\r
        static global_game_variables_t gvar;\r
-       Startup16(&gvar);\r
+       Startup16(&gvar);//initgame equ\r
 \r
        /* save the palette */\r
        modexPalSave(gvar.video.dpal);\r
@@ -52,8 +52,8 @@ main(int argc, char *argv[])
        modexFadeOn(4, gvar.video.dpal);\r
 //     InitGame ();//to be defined in 16_tail\r
 \r
-//     DemoLoop();//to be defined in 16_tail\r
+//++++ DemoLoop();//to be defined in 16_tail\r
 \r
-//     Quit("Demo loop exited???");\r
+//++++ Quit("Demo loop exited???");\r
 \r
 }\r

diff --git a/src/exmmtest.c b/src/exmmtest.c
index 11cdf7cfe77fb17f4422ddf193c3bf7acc9a26ff..bc10fe296dec97e3cf42ea9b293b38b2974a8f84 100755 (executable)
--- a/src/exmmtest.c
+++ b/src/exmmtest.c
@@ -226,7 +226,7 @@ PRINTBB; printf("\n\npress any key to continue!\n"); getch();
 \r
 #ifdef __WATCOMC__\r
        IN_Startup(&gvar);\r
-       ShapeTest (&gvar);\r
+       ShapeTest_(&gvar);\r
        IN_Shutdown(&gvar);\r
 #endif\r
 \r

diff --git a/src/lib/16_dbg.c b/src/lib/16_dbg.c
index 8fa25c3fd8d6385da2f46be082b5c52d6836a623..fff20c22df5daefed194a1055ce10bf7c78c3c35 100755 (executable)
--- a/src/lib/16_dbg.c
+++ b/src/lib/16_dbg.c
@@ -108,7 +108,7 @@ void _DEBUGF(const char *fmt,...) {
 */\r
 \r
 #pragma warn -pia\r
-void ShapeTest (global_game_variables_t *gvar)\r
+void ShapeTest_(global_game_variables_t *gvar)\r
 {\r
 extern word    NumDigi;\r
 extern word    _seg *DigiList;\r
@@ -266,8 +266,6 @@ static      char    buf[10];
                {}\r
 //                     SD_Poll();\r
 \r
-//if(IN_KeyDown(sc_Escape)) break;\r
-\r
                IN_ClearKey(scan);\r
                switch (scan)\r
                {\r

diff --git a/src/lib/16_dbg.h b/src/lib/16_dbg.h
index a4a018431848aa3611cd91fedccf76593b6bb2e4..6903aa575269784263aa29059ee610f024115d44 100755 (executable)
--- a/src/lib/16_dbg.h
+++ b/src/lib/16_dbg.h
@@ -64,6 +64,6 @@ static inline int _DEBUG_INIT() {
 # endif\r
 #endif //watcomc\r
 \r
-void ShapeTest (global_game_variables_t *gvar);\r
+void ShapeTest_(global_game_variables_t *gvar);\r
 \r
 #endif // _SRC_LIB_16_DBG\r

diff --git a/src/zcroll.c b/src/xcroll.c
similarity index 100%
rename from src/zcroll.c
rename to src/xcroll.c