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

diff --git a/.gitmodules b/.gitmodules
index 11d69bb62dde1464b96afe06dfca258a9a092c61..1805ff91fdffbf6f6adda80ce832405db740a9b5 100755 (executable)
--- a/.gitmodules
+++ b/.gitmodules
@@ -21,3 +21,7 @@
 [submodule "Catacomb3D"]
         path = 16/Catacomb3D
        url = https://github.com/FlatRockSoft/Catacomb3D.git
+
+[submodule "shitman"]
+        path = 16/shitman
+        url = https://github.com/joncampbell123/shitman.git

diff --git a/makefile b/makefile
index 253037a7a14f93363768b346f4fc28c2e03355ef..99d8ae27d78966f5cd017a1d8d8cc04b0d55e5c1 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -593,6 +593,7 @@ reinitlibs: .symbolic
        @$(REMOVECOMMAND) -rf 16/wolf3d
        @$(REMOVECOMMAND) -rf 16/keen
        @$(REMOVECOMMAND) -rf 16/Catacomb3D
+       @$(REMOVECOMMAND) -rf 16/shitman
        @wmake -s -h initlibs
 
 initlibs: .symbolic
@@ -603,6 +604,7 @@ initlibs: .symbolic
        @git clone https://github.com/id-Software/wolf3d.git
        @git clone https://github.com/keendreams/keen.git
        @git clone https://github.com/FlatRockSoft/Catacomb3D.git
+       @git clone https://github.com/joncampbell123/shitman.git
        @cd $(BUILD_ROOT)
        @$(COPYCOMMAND) $(DOSLIBDIR)/make-lowercase .
 

diff --git a/src/lib/16_timer.c b/src/lib/16_timer.c
index c5aae48597f78c67a18d8d26d17322710d5f1ae1..c1716567221b88c3ce711dc9e2ad9b644ed69d0f 100755 (executable)
--- a/src/lib/16_timer.c
+++ b/src/lib/16_timer.c
@@ -41,7 +41,7 @@ clock_t start_timer(global_game_variables_t *gv)
                break;\r
                default:\r
                        gv->kurokku.fpscap=1;\r
-                       gv->kurokku.frames_per_second=60;\r
+                       gv->kurokku.frames_per_second=FPSVALUE;\r
                break;\r
        }\r
        return gv->kurokku.t;\r
@@ -96,6 +96,7 @@ void shinkutxt(global_game_variables_t *gv)
 //     }\r
 }\r
 \r
+#if 0\r
 void WaitPee()\r
 {\r
     while(inp(INPUT_STATUS_1)  & 8)  {\r
@@ -106,3 +107,4 @@ void WaitPee()
        /* spin */\r
     }\r
 }\r
+#endif\r

diff --git a/src/lib/16_timer.h b/src/lib/16_timer.h
index ec25af51029baf3004431433bfa4f00df907abfe..8bcd10c001861360b2bd3ee1d4a47b1c75c5f4d4 100755 (executable)
--- a/src/lib/16_timer.h
+++ b/src/lib/16_timer.h
@@ -25,12 +25,14 @@
 #include "src/lib/16_head.h"\r
 #include "src/lib/wcpu/16_wcpu.h"\r
 \r
+#define FPSVALUE 60\r
+\r
 clock_t start_timer(global_game_variables_t *gv);\r
 double elapsed_timer(global_game_variables_t *gv);\r
 double ticktock(global_game_variables_t *gv);\r
 double time_in_seconds(global_game_variables_t *gv);\r
 //double time_in_seconds(time_t in_t);\r
 void shinkutxt(global_game_variables_t *gv);\r
-void WaitPee(void);\r
+//void WaitPee(void);\r
 \r
 #endif\r

diff --git a/src/lib/doslib b/src/lib/doslib
index b7cbedd253331c62aa1088cc4ca66b410c88f847..bd7aef78dacba681d641b637b31a93682e1109e0 160000 (submodule)
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit b7cbedd253331c62aa1088cc4ca66b410c88f847
+Subproject commit bd7aef78dacba681d641b637b31a93682e1109e0

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 5ed042332d28b58e97c213edd884d697e60cc62d..1888cb4fa33b0d90f79c4b08dbd0adca0898e883 100755 (executable)
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -915,7 +915,7 @@ void shinku(global_game_variables_t *gv)
 //#else\r
                        //modexWaitBorder();\r
 //#endif\r
-                       gv->kurokku.frames_per_second=60;\r
+                       gv->kurokku.frames_per_second=FPSVALUE;\r
                break;\r
        }\r
        PM_NextFrame(gv);\r

diff --git a/src/util/git/git_modu.les b/src/util/git/git_modu.les
index 11d69bb62dde1464b96afe06dfca258a9a092c61..1805ff91fdffbf6f6adda80ce832405db740a9b5 100755 (executable)
--- a/src/util/git/git_modu.les
+++ b/src/util/git/git_modu.les
@@ -21,3 +21,7 @@
 [submodule "Catacomb3D"]
         path = 16/Catacomb3D
        url = https://github.com/FlatRockSoft/Catacomb3D.git
+
+[submodule "shitman"]
+        path = 16/shitman
+        url = https://github.com/joncampbell123/shitman.git