X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscroll16.c;h=5ed042332d28b58e97c213edd884d697e60cc62d;hb=fe83dc972e62ab0db157d5a953db2f5236876d67;hp=94338ab7d872a49765a44ccfe9f9c4d8f4606653;hpb=cecbe84f7c61a26fa2285fc125839b2ff50a7f51;p=16.git

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 94338ab7..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;
 	}
 }
@@ -614,16 +615,16 @@ void ZC_mapScroll(map_view_t *mv, player_t *player, word pn)
 //===========================================================================
 //TODO: put player in starting position of assigned spot on map
 //default player position on the viewable map
-void ZC_PlayerXYpos(int x, int y, player_t *player, map_view_t *pip, nibble pn, boolean defaultsw)
+void ZC_PlayerXYpos(int x, int y, player_t *player, map_view_t *pip, boolean defaultsw)
 {
-	player[pn].enti.tx = x + pip[0].tx;
-	player[pn].enti.ty = y + pip[0].ty;
+	player->enti.tx = x + pip[0].tx;
+	player->enti.ty = y + pip[0].ty;
 
 	switch(defaultsw)
 	{
 		case 1:
-			player[pn].enti.tx += pip[0].page->ti.tilemidposscreenx;
-			player[pn].enti.ty += pip[0].page->ti.tilemidposscreeny;
+			player->enti.tx += pip[0].page->ti.tilemidposscreenx;
+			player->enti.ty += pip[0].page->ti.tilemidposscreeny;
 		break;
 		case 0:
 		break;
@@ -877,7 +878,7 @@ void shinku(global_game_variables_t *gv)
 				gv->video.page[/*!*/(gv->video.p)].dx,
 				gv->video.page[/*!*/(gv->video.p)].dy,
 				96, 16);
-			modexprint(&(gv->video.page[/*!*/(gv->video.p)]), x, y, type, 1, col, 1, bgcol, global_temp_status_text);
+			modexprint(&(gv->video.page[/*!*/(gv->video.p)]), x, y, type, 1, col, bgcol, 1, global_temp_status_text);
 //0000printf("dx=%u	dy=%u\n", gv->video.page[/*!*/(gv->video.p)].dx, gv->video.page[/*!*/(gv->video.p)].dy);
 		}
 #endif
@@ -908,13 +909,12 @@ void shinku(global_game_variables_t *gv)
 			gv->kurokku.frames_per_second=1;
 		break;
 		case 1:
-#ifdef OLDWALKSHOWPAGESTUFF
+//#ifndef OLDWALKSHOWPAGESTUFF
+			//vga_wait_for_vsync();
+			vga_wait_for_vsync_end();
+//#else
 			//modexWaitBorder();
-			//modexWaitBorder_start();
-#else
-			vga_wait_for_vsync();
-			//vga_wait_for_vsync_end();
-#endif
+//#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
 }
 
 /*
@@ -1058,7 +1061,6 @@ void player_walk(player_t *player, map_view_t *map_v){
  */
 
 
-
 void mapScroll(map_view_t *mv, player_t *player)
 {
 	//word x, y;  /* coordinate for drawing */
@@ -1092,3 +1094,11 @@ void mapScroll(map_view_t *mv, player_t *player)
 			break;
 	}
 }
+
+void ZC_GirdChk (global_game_variables_t *gvar, player_t *player)
+{
+	if((player->enti.q==1) &&
+		!(player->enti.x%gvar->mv[0].map->tiles->tileWidth==0 && player->enti.y%gvar->mv[0].map->tiles->tileHeight==0))
+		ZC_PlayerXYpos(0, 0, player, gvar->mv, 1);
+		//TODO: MAKE SURE TO RESYNC PLAYER IN WALKABLE SPOT
+}