From: sparky4 <sparky4@cock.li>
Date: Sat, 27 May 2017 02:47:27 +0000 (-0500)
Subject: 16_ca needs huge amounts of work and I should remember what needs to be done soon... 
X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=commitdiff_plain;h=35f9e7e103ce902e941007e84389a754f16ec058

16_ca needs huge amounts of work and I should remember what needs to be done soon[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]older zcroll renamed to xcroll][zcroll is now the pre menu game loop system with PROPER data usage with CAMMPM] added 1st scroll back [i work on CA] palette debug show values added wwww and i need to know how to see vrs/vrl imaage data palette index numbers [i am trying to find out how the hell you get the index number values of VRL/VRS] boom has been fixed ^^[CA_CacheMap added seems to be used in start a new game] what is mapsegs?
---

diff --git a/.gitmodules b/.gitmodules
index 11d69bb6..1805ff91 100755
--- 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 253037a7..99d8ae27 100755
--- 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 c5aae485..c1716567 100755
--- 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;
 		default:
 			gv->kurokku.fpscap=1;
-			gv->kurokku.frames_per_second=60;
+			gv->kurokku.frames_per_second=FPSVALUE;
 		break;
 	}
 	return gv->kurokku.t;
@@ -96,6 +96,7 @@ void shinkutxt(global_game_variables_t *gv)
 // 	}
 }
 
+#if 0
 void WaitPee()
 {
     while(inp(INPUT_STATUS_1)  & 8)  {
@@ -106,3 +107,4 @@ void WaitPee()
 	/* spin */
     }
 }
+#endif
diff --git a/src/lib/16_timer.h b/src/lib/16_timer.h
index ec25af51..8bcd10c0 100755
--- a/src/lib/16_timer.h
+++ b/src/lib/16_timer.h
@@ -25,12 +25,14 @@
 #include "src/lib/16_head.h"
 #include "src/lib/wcpu/16_wcpu.h"
 
+#define FPSVALUE 60
+
 clock_t start_timer(global_game_variables_t *gv);
 double elapsed_timer(global_game_variables_t *gv);
 double ticktock(global_game_variables_t *gv);
 double time_in_seconds(global_game_variables_t *gv);
 //double time_in_seconds(time_t in_t);
 void shinkutxt(global_game_variables_t *gv);
-void WaitPee(void);
+//void WaitPee(void);
 
 #endif
diff --git a/src/lib/doslib b/src/lib/doslib
index b7cbedd2..bd7aef78 160000
--- 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 5ed04233..1888cb4f 100755
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -915,7 +915,7 @@ void shinku(global_game_variables_t *gv)
 //#else
 			//modexWaitBorder();
 //#endif
-			gv->kurokku.frames_per_second=60;
+			gv->kurokku.frames_per_second=FPSVALUE;
 		break;
 	}
 	PM_NextFrame(gv);
diff --git a/src/util/git/git_modu.les b/src/util/git/git_modu.les
index 11d69bb6..1805ff91 100755
--- 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