From: sparky4 <sparky4@cock.li>
Date: Wed, 17 May 2017 20:15:39 +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=fe83dc972e62ab0db157d5a953db2f5236876d67

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/exmmtest.upx b/exmmtest.upx
new file mode 100755
index 00000000..5f0670ca
Binary files /dev/null and b/exmmtest.upx differ
diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 0aad37a2..5ed04233 100755
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -125,190 +125,191 @@ boolean ZCL_ScreenMidPosChk(map_view_t *map_v, nibble dir, int tx, int ty)
 	return false;
 }
 
-//#define INC_PER_FRAME if(player[pn].enti.q&1) player[pn].enti.persist_aniframe++; if(player[pn].enti.persist_aniframe>4) player[pn].enti.persist_aniframe = 1;
+//#define INC_PER_FRAME if(gvar->player[pn].enti.q&1) gvar->player[pn].enti.persist_aniframe++; if(gvar->player[pn].enti.persist_aniframe>4) gvar->player[pn].enti.persist_aniframe = 1;
 #ifdef OLDWALKSHOWPAGESTUFF
-#define SHOWMVFUN__ ZC_ShowMV(pip, 1, 0);
+#define SHOWMVFUN__ VL_ShowPage(&gvar->video.page[0], 1, 0);//modexShowPage(&gvar->video.page);
+//ZC_ShowMV(gvar->mv, 1, 0);
 #endif
 
-void ZC_walk(map_view_t *pip, player_t *player, word pn)
+void ZC_walk(global_game_variables_t *gvar, word pn)
 {
-	switch(player[pn].enti.d)
+	switch(gvar->player[pn].enti.d)
 	{
 		//no direction
 		case 2:
-			//0000pip[0].video->startclk = (*clockw);
+			//0000gvar->mv[0].video->startclk = (*clockw);
 		break;
 		//right movement
 		case 3:
-			if(ZCL_ScreenMidPosChk(pip, player[pn].enti.d, player[pn].enti.tx, player[pn].enti.ty) &&
-			ZCL_CollCheck(pip, player[pn].enti.d, player[pn].enti.tx, player[pn].enti.ty))//!(player[pn].enti.tx+1 == TRIGGX && player[pn].enti.ty == TRIGGY))	//collision detection!
+			if(ZCL_ScreenMidPosChk(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty) &&
+			ZCL_CollCheck(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty))//!(gvar->player[pn].enti.tx+1 == TRIGGX && gvar->player[pn].enti.ty == TRIGGY))	//collision detection!
 			{
-				player[pn].walktype=2;
-				if(player[pn].enti.q<=player[pn].enti.spt)
+				gvar->player[pn].walktype=2;
+				if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt)
 				{
-					ZC_animatePlayer(pip, player, pn);
-					ZC_mapScroll(pip, player, pn);
-					player[pn].enti.q++;
-					//0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;
+					ZC_animatePlayer(gvar->mv, gvar->player, pn);
+					ZC_mapScroll(gvar->mv, gvar->player, pn);
+					gvar->player[pn].enti.q++;
+					//0000gvar->mv[0].video->clk = ((*clockw)-gvar->mv[0].video->startclk)/18.2;
 #ifdef OLDWALKSHOWPAGESTUFF
 					SHOWMVFUN__
 #endif
-				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx++; }
+				} else { gvar->player[pn].enti.q = 1; gvar->player[pn].enti.d = 2; gvar->player[pn].enti.tx++; }
 			}
-			else if(ZCL_mapEdgeChk(pip, player[pn].enti.d, player[pn].enti.tx, player[pn].enti.ty, 0, 1) &&
-			ZCL_CollCheck(pip, player[pn].enti.d, player[pn].enti.tx, player[pn].enti.ty))//!(player[pn].enti.tx+1 == TRIGGX && player[pn].enti.ty == TRIGGY))
+			else if(ZCL_mapEdgeChk(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty, 0, 1) &&
+			ZCL_CollCheck(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty))//!(gvar->player[pn].enti.tx+1 == TRIGGX && gvar->player[pn].enti.ty == TRIGGY))
 			{
-				player[pn].walktype=1;
-				if(player[pn].enti.q<=player[pn].enti.spt)
+				gvar->player[pn].walktype=1;
+				if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt)
 				{
-					player[pn].enti.x+=(player[pn].enti.speed);
-					ZC_animatePlayer(pip, player, pn);
-					player[pn].enti.q++;
+					gvar->player[pn].enti.x+=(gvar->player[pn].enti.speed);
+					ZC_animatePlayer(gvar->mv, gvar->player, pn);
+					gvar->player[pn].enti.q++;
 #ifdef OLDWALKSHOWPAGESTUFF
 					SHOWMVFUN__
 #endif
-				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx++; }
+				} else { gvar->player[pn].enti.q = 1; gvar->player[pn].enti.d = 2; gvar->player[pn].enti.tx++; }
 			}
 			else
 			{
-				player[pn].walktype=0;
-				ZC_animatePlayer(pip, player, pn);
-				player[pn].enti.d = 2;
+				gvar->player[pn].walktype=0;
+				ZC_animatePlayer(gvar->mv, gvar->player, pn);
+				gvar->player[pn].enti.d = 2;
 #ifdef OLDWALKSHOWPAGESTUFF
 				SHOWMVFUN__
 #endif
 			}
-			player[pn].enti.triggerx = player[pn].enti.tx+1;
-			player[pn].enti.triggery = player[pn].enti.ty;
+			gvar->player[pn].enti.triggerx = gvar->player[pn].enti.tx+1;
+			gvar->player[pn].enti.triggery = gvar->player[pn].enti.ty;
 		break;
 		//left movement
 		case 1:
-			if(ZCL_ScreenMidPosChk(pip, player[pn].enti.d, player[pn].enti.tx, player[pn].enti.ty) &&
-			ZCL_CollCheck(pip, player[pn].enti.d, player[pn].enti.tx, player[pn].enti.ty))//!(player[pn].enti.tx-1 == TRIGGX && player[pn].enti.ty == TRIGGY))	//collision detection!
+			if(ZCL_ScreenMidPosChk(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty) &&
+			ZCL_CollCheck(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty))//!(gvar->player[pn].enti.tx-1 == TRIGGX && gvar->player[pn].enti.ty == TRIGGY))	//collision detection!
 			{
-				player[pn].walktype=2;
-				if(player[pn].enti.q<=player[pn].enti.spt)
+				gvar->player[pn].walktype=2;
+				if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt)
 				{
-					ZC_animatePlayer(pip, player, pn);
-					ZC_mapScroll(pip, player, pn);
-					player[pn].enti.q++;
-					//0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;
+					ZC_animatePlayer(gvar->mv, gvar->player, pn);
+					ZC_mapScroll(gvar->mv, gvar->player, pn);
+					gvar->player[pn].enti.q++;
+					//0000gvar->mv[0].video->clk = ((*clockw)-gvar->mv[0].video->startclk)/18.2;
 #ifdef OLDWALKSHOWPAGESTUFF
 					SHOWMVFUN__
 #endif
-				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx--; }
+				} else { gvar->player[pn].enti.q = 1; gvar->player[pn].enti.d = 2; gvar->player[pn].enti.tx--; }
 			}
-			else if(ZCL_mapEdgeChk(pip, player[pn].enti.d, player[pn].enti.tx, player[pn].enti.ty, 0, 1) &&
-			ZCL_CollCheck(pip, player[pn].enti.d, player[pn].enti.tx, player[pn].enti.ty))//!(player[pn].enti.tx-1 == TRIGGX && player[pn].enti.ty == TRIGGY))
+			else if(ZCL_mapEdgeChk(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty, 0, 1) &&
+			ZCL_CollCheck(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty))//!(gvar->player[pn].enti.tx-1 == TRIGGX && gvar->player[pn].enti.ty == TRIGGY))
 			{
-				player[pn].walktype=1;
-				if(player[pn].enti.q<=player[pn].enti.spt)
+				gvar->player[pn].walktype=1;
+				if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt)
 				{
-					player[pn].enti.x-=(player[pn].enti.speed);
-					ZC_animatePlayer(pip, player, pn);
-					player[pn].enti.q++;
+					gvar->player[pn].enti.x-=(gvar->player[pn].enti.speed);
+					ZC_animatePlayer(gvar->mv, gvar->player, pn);
+					gvar->player[pn].enti.q++;
 #ifdef OLDWALKSHOWPAGESTUFF
 					SHOWMVFUN__
 #endif
-				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx--; }
+				} else { gvar->player[pn].enti.q = 1; gvar->player[pn].enti.d = 2; gvar->player[pn].enti.tx--; }
 			}
 			else
 			{
-				player[pn].walktype=0;
-				ZC_animatePlayer(pip, player, pn);
-				player[pn].enti.d = 2;
+				gvar->player[pn].walktype=0;
+				ZC_animatePlayer(gvar->mv, gvar->player, pn);
+				gvar->player[pn].enti.d = 2;
 #ifdef OLDWALKSHOWPAGESTUFF
 				SHOWMVFUN__
 #endif
 			}
-			player[pn].enti.triggerx = player[pn].enti.tx-1;
-			player[pn].enti.triggery = player[pn].enti.ty;
+			gvar->player[pn].enti.triggerx = gvar->player[pn].enti.tx-1;
+			gvar->player[pn].enti.triggery = gvar->player[pn].enti.ty;
 		break;
 		//down movement
 		case 4:
-			if(ZCL_ScreenMidPosChk(pip, player[pn].enti.d, player[pn].enti.tx, player[pn].enti.ty) &&
-			ZCL_CollCheck(pip, player[pn].enti.d, player[pn].enti.tx, player[pn].enti.ty))//!(player[pn].enti.tx == TRIGGX && player[pn].enti.ty+1 == TRIGGY))	//collision detection!
+			if(ZCL_ScreenMidPosChk(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty) &&
+			ZCL_CollCheck(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty))//!(gvar->player[pn].enti.tx == TRIGGX && gvar->player[pn].enti.ty+1 == TRIGGY))	//collision detection!
 			{
-				player[pn].walktype=2;
-				if(player[pn].enti.q<=player[pn].enti.spt)
+				gvar->player[pn].walktype=2;
+				if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt)
 				{
-					ZC_animatePlayer(pip, player, pn);
-					ZC_mapScroll(pip, player, pn);
-					player[pn].enti.q++;
-					//0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;
+					ZC_animatePlayer(gvar->mv, gvar->player, pn);
+					ZC_mapScroll(gvar->mv, gvar->player, pn);
+					gvar->player[pn].enti.q++;
+					//0000gvar->mv[0].video->clk = ((*clockw)-gvar->mv[0].video->startclk)/18.2;
 #ifdef OLDWALKSHOWPAGESTUFF
 					SHOWMVFUN__
 #endif
-				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty++; }
+				} else { gvar->player[pn].enti.q = 1; gvar->player[pn].enti.d = 2; gvar->player[pn].enti.ty++; }
 			}
-			else if(ZCL_mapEdgeChk(pip, player[pn].enti.d, player[pn].enti.tx, player[pn].enti.ty, 0, 1) &&
-			ZCL_CollCheck(pip, player[pn].enti.d, player[pn].enti.tx, player[pn].enti.ty))//!(player[pn].enti.tx == TRIGGX && player[pn].enti.ty+1 == TRIGGY))
+			else if(ZCL_mapEdgeChk(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty, 0, 1) &&
+			ZCL_CollCheck(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty))//!(gvar->player[pn].enti.tx == TRIGGX && gvar->player[pn].enti.ty+1 == TRIGGY))
 			{
-				player[pn].walktype=1;
-				if(player[pn].enti.q<=player[pn].enti.spt)
+				gvar->player[pn].walktype=1;
+				if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt)
 				{
-					player[pn].enti.y+=(player[pn].enti.speed);
-					ZC_animatePlayer(pip, player, pn);
-					player[pn].enti.q++;
+					gvar->player[pn].enti.y+=(gvar->player[pn].enti.speed);
+					ZC_animatePlayer(gvar->mv, gvar->player, pn);
+					gvar->player[pn].enti.q++;
 #ifdef OLDWALKSHOWPAGESTUFF
 					SHOWMVFUN__
 #endif
-				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty++; }
+				} else { gvar->player[pn].enti.q = 1; gvar->player[pn].enti.d = 2; gvar->player[pn].enti.ty++; }
 			}
 			else
 			{
-				player[pn].walktype=0;
-				ZC_animatePlayer(pip, player, pn);
-				player[pn].enti.d = 2;
+				gvar->player[pn].walktype=0;
+				ZC_animatePlayer(gvar->mv, gvar->player, pn);
+				gvar->player[pn].enti.d = 2;
 #ifdef OLDWALKSHOWPAGESTUFF
 				SHOWMVFUN__
 #endif
 			}
-			player[pn].enti.triggerx = player[pn].enti.tx;
-			player[pn].enti.triggery = player[pn].enti.ty+1;
+			gvar->player[pn].enti.triggerx = gvar->player[pn].enti.tx;
+			gvar->player[pn].enti.triggery = gvar->player[pn].enti.ty+1;
 		break;
 		//up movement
 		case 0:
-			if(ZCL_ScreenMidPosChk(pip, player[pn].enti.d, player[pn].enti.tx, player[pn].enti.ty) &&
-			ZCL_CollCheck(pip, player[pn].enti.d, player[pn].enti.tx, player[pn].enti.ty))//!(player[pn].enti.tx == TRIGGX && player[pn].enti.ty-1 == TRIGGY))	//collision detection!
+			if(ZCL_ScreenMidPosChk(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty) &&
+			ZCL_CollCheck(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty))//!(gvar->player[pn].enti.tx == TRIGGX && gvar->player[pn].enti.ty-1 == TRIGGY))	//collision detection!
 			{
-				player[pn].walktype=2;
-				if(player[pn].enti.q<=player[pn].enti.spt)
+				gvar->player[pn].walktype=2;
+				if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt)
 				{
-					ZC_animatePlayer(pip, player, pn);
-					ZC_mapScroll(pip, player, pn);
-					player[pn].enti.q++;
-					//0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;
+					ZC_animatePlayer(gvar->mv, gvar->player, pn);
+					ZC_mapScroll(gvar->mv, gvar->player, pn);
+					gvar->player[pn].enti.q++;
+					//0000gvar->mv[0].video->clk = ((*clockw)-gvar->mv[0].video->startclk)/18.2;
 #ifdef OLDWALKSHOWPAGESTUFF
 					SHOWMVFUN__
 #endif
-				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty--; }
+				} else { gvar->player[pn].enti.q = 1; gvar->player[pn].enti.d = 2; gvar->player[pn].enti.ty--; }
 			}
-			else if(ZCL_mapEdgeChk(pip, player[pn].enti.d, player[pn].enti.tx, player[pn].enti.ty, 0, 1) &&
-			ZCL_CollCheck(pip, player[pn].enti.d, player[pn].enti.tx, player[pn].enti.ty))//!(player[pn].enti.tx == TRIGGX &&  player[pn].enti.ty-1 == TRIGGY))
+			else if(ZCL_mapEdgeChk(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty, 0, 1) &&
+			ZCL_CollCheck(gvar->mv, gvar->player[pn].enti.d, gvar->player[pn].enti.tx, gvar->player[pn].enti.ty))//!(gvar->player[pn].enti.tx == TRIGGX &&  gvar->player[pn].enti.ty-1 == TRIGGY))
 			{
-				player[pn].walktype=1;
-				if(player[pn].enti.q<=player[pn].enti.spt)
+				gvar->player[pn].walktype=1;
+				if(gvar->player[pn].enti.q<=gvar->player[pn].enti.spt)
 				{
-					player[pn].enti.y-=(player[pn].enti.speed);
-					ZC_animatePlayer(pip, player, pn);
-					player[pn].enti.q++;
+					gvar->player[pn].enti.y-=(gvar->player[pn].enti.speed);
+					ZC_animatePlayer(gvar->mv, gvar->player, pn);
+					gvar->player[pn].enti.q++;
 #ifdef OLDWALKSHOWPAGESTUFF
 					SHOWMVFUN__
 #endif
-				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty--; }
+				} else { gvar->player[pn].enti.q = 1; gvar->player[pn].enti.d = 2; gvar->player[pn].enti.ty--; }
 			}
 			else
 			{
-				player[pn].walktype=0;
-				ZC_animatePlayer(pip, player, pn);
-				player[pn].enti.d = 2;
+				gvar->player[pn].walktype=0;
+				ZC_animatePlayer(gvar->mv, gvar->player, pn);
+				gvar->player[pn].enti.d = 2;
 #ifdef OLDWALKSHOWPAGESTUFF
 				SHOWMVFUN__
 #endif
 			}
-			player[pn].enti.triggerx = player[pn].enti.tx;
-			player[pn].enti.triggery = player[pn].enti.ty-1;
+			gvar->player[pn].enti.triggerx = gvar->player[pn].enti.tx;
+			gvar->player[pn].enti.triggery = gvar->player[pn].enti.ty-1;
 		break;
 	}
 }
@@ -908,13 +909,12 @@ void shinku(global_game_variables_t *gv)
 			gv->kurokku.frames_per_second=1;
 		break;
 		case 1:
-#ifdef OLDWALKSHOWPAGESTUFF
-			//modexWaitBorder();
-			//modexWaitBorder_start();
-#else
+//#ifndef OLDWALKSHOWPAGESTUFF
 			//vga_wait_for_vsync();
 			vga_wait_for_vsync_end();
-#endif
+//#else
+			//modexWaitBorder();
+//#endif
 			gv->kurokku.frames_per_second=60;
 		break;
 	}
@@ -995,6 +995,9 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn)
 		animate_spri(&player[pn].enti, pip[0].video);
 	}
 //0000if(player[pn].enti.q<4) delay(200);
+#ifdef OLDWALKSHOWPAGESTUFF
+	modexWaitBorder();
+#endif
 }
 
 /*
diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 784e7cf7..48eecf89 100755
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -41,9 +41,11 @@
 
 #define SPRITE
 //#define TILERENDER
+
 //0000#define SHOWFPS
 //#define OLDWALKSHOWPAGESTUFF
 
+
 #define PLAYERBMPDATAVAR	gvar.player[pn].data
 #define PLAYERBMPDATA		*PLAYERBMPDATAVAR
 #define PLAYERBMPDATAPTR	PLAYERBMPDATAVAR
@@ -105,7 +107,7 @@ extern char global_temp_status_text[512];
 extern char global_temp_status_text2[512];
 
 void initMap(map_t *map);
-void ZC_walk(map_view_t *pip, player_t *player, word pn);
+void ZC_walk(global_game_variables_t *gvar, word pn);
 void ZC_panPageManual(map_view_t *pip, player_t *player, word pn);
 void ZC_MVSetup(map_view_t *pip, map_t *map, global_game_variables_t *gv);
 void ZC_MVInit(map_view_t *pip, int tx, int ty);
diff --git a/src/xcroll.c b/src/xcroll.c
index ef1d11ed..52d9b5b9 100755
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -158,6 +158,10 @@ void main(int argc, char *argv[])
 	gvar.video.page[0].tlx=gvar.mv[0].tx*TILEWH;
 	gvar.video.page[0].tly=gvar.mv[0].ty*TILEWH;
 
+#ifdef OLDWALKSHOWPAGESTUFF
+	VL_ShowPage(&(gvar.video.page[gvar.video.sp]), gvar.kurokku.fpscap, 0);
+#endif
+
 	shinku(&gvar);
 //modexpdump(gvar.mv[0].page);
 #ifdef FADE
@@ -176,7 +180,8 @@ void main(int argc, char *argv[])
 		IN_ReadControl(&gvar.player[0], &gvar);
 		if(!panswitch){
 			//ZC_walk2(gvar.player[0].ent, mv);
-			ZC_walk(&gvar.mv, &gvar.player, 0);
+			//ZC_walk(&gvar.mv, &gvar.player, 0);
+			ZC_walk(&gvar, 0);
 		}else{
 			TAIL_PANKEYFUNZC;
 			//printf("	gvar.player[0].enti.q: %d", gvar.player[0].enti.q);	printf("	gvar.player[0].d: %d\n", gvar.player[0].d);