X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Flib%2Fscroll16.c;h=948c9f8aaa202b6176145f55ad485cd38cb725cd;hb=ffbad4972c8eed182edd7c0ba1fef0bc1d457bf2;hp=cab3823fcd33b682d30cd47195a6afe6a08d20dd;hpb=c721ed46c712b88421969e72e995f5f847494436;p=proj16%2F16.git

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index cab3823f..948c9f8a 100755
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -24,209 +24,11 @@
 */
 #include "src/lib/scroll16.h"
 
-void walk(map_view_t *pip, player_t *player, word pn)
-{
-	#define INC_PER_FRAME if(player[pn].q&1) player[pn].persist_aniframe++; if(player[pn].persist_aniframe>4) player[pn].persist_aniframe = 1;
-	//printf("player[%d].d=%d\n", pn, player[pn].d);
-	switch(player[pn].d)
-	{
-		//no direction
-		case 2:
-			//0000pip[0].video->startclk = (*clockw);
-		break;
-		//right movement
-		case 3:
-			//printf("pip[0].page->tilesw=%d	", pip[0].page->tilesw); printf("pip[0].page->tw=%d\n", pip[0].page->tw);
-			if(pip[0].tx >= 0 && pip[0].tx+pip[0].page->tw < pip[0].map->width && player[pn].tx == pip[0].tx+pip[0].page->tilemidposscreenx &&
-			!(pip[0].map->data[(player[pn].tx)+(pip[0].map->width*(player[pn].ty-1))] == 0))//!(player[pn].tx+1 == TRIGGX && player[pn].ty == TRIGGY))	//collision detection!
-			{
-				if(player[pn].q<=player[pn].spt)
-				{
-					INC_PER_FRAME;
-					animatePlayer(pip, player, pn, 1);
-					ScrollRight(pip, player, 3, pn);
-					ScrollRight(pip, player, 2, pn);
-					//mapScrollRight(pip, player, !(pip[0].video->p), pn);
-					mapScrollRight(pip, player, (pip[0].video->p), pn);
-					if(!pageflipflop) modexShowPage(pip[1].page);
-					player[pn].q++;
-					//0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;
-				} else { player[pn].q = 1; player[pn].d = 2; player[pn].tx++; }
-			}
-			else if(player[pn].tx < pip[0].map->width && !(pip[0].map->data[(player[pn].tx)+(pip[0].map->width*(player[pn].ty-1))] == 0))//!(player[pn].tx+1 == TRIGGX && player[pn].ty == TRIGGY))
-			{
-				if(player[pn].q<=player[pn].spt)
-				{
-					INC_PER_FRAME;
-					player[pn].x+=(player[pn].speed);
-					animatePlayer(pip, player, pn, 0);
-					if(!pageflipflop) modexShowPage(pip[1].page);
-					player[pn].q++;
-				} else { player[pn].q = 1; player[pn].d = 2; player[pn].tx++; }
-			}
-			else
-			{
-				if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x, player[pn].y-TILEWH, player[pn].x, player[pn].y-TILEWH, 24, 32);
-#ifdef SPRITE
-				modexDrawSpriteRegion(pip[0].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 24, 32, PLAYERBMPDATAPTR);
-#else
-				modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 14);
-#endif
-				if(!pageflipflop) modexShowPage(pip[1].page);
-				player[pn].d = 2;
-			}
-			player[pn].triggerx = player[pn].tx+1;
-			player[pn].triggery = player[pn].ty;
-		break;
-
-		//left movement
-		case 1:
-			if(pip[0].tx > 0 && pip[0].tx+pip[0].page->tw <= pip[0].map->width && player[pn].tx == pip[0].tx+pip[0].page->tilemidposscreenx &&
-			!(pip[0].map->data[(player[pn].tx-2)+(pip[0].map->width*(player[pn].ty-1))] == 0))//!(player[pn].tx-1 == TRIGGX && player[pn].ty == TRIGGY))	//collision detection!
-			{
-				if(player[pn].q<=player[pn].spt)
-				{
-					INC_PER_FRAME;
-					animatePlayer(pip, player, pn, 1);
-					ScrollLeft(pip, player, 3, pn);
-					ScrollLeft(pip, player, 2, pn);
-					//mapScrollLeft(pip, player, !(pip[0].video->p), pn);
-					mapScrollLeft(pip, player, (pip[0].video->p), pn);
-					if(!pageflipflop) modexShowPage(pip[1].page);
-					player[pn].q++;
-					//0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;
-				} else { player[pn].q = 1; player[pn].d = 2; player[pn].tx--; }
-			}
-			else if(player[pn].tx > 1 && !(pip[0].map->data[(player[pn].tx-2)+(pip[0].map->width*(player[pn].ty-1))] == 0))//!(player[pn].tx-1 == TRIGGX && player[pn].ty == TRIGGY))
-			{
-				if(player[pn].q<=player[pn].spt)
-				{
-					INC_PER_FRAME;
-					player[pn].x-=(player[pn].speed);
-					animatePlayer(pip, player, pn, 0);
-					if(!pageflipflop) modexShowPage(pip[1].page);
-					player[pn].q++;
-				} else { player[pn].q = 1; player[pn].d = 2; player[pn].tx--; }
-			}
-			else
-			{
-				if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x, player[pn].y-TILEWH, player[pn].x, player[pn].y-TILEWH, 24, 32);
-#ifdef SPRITE
-				modexDrawSpriteRegion(pip[0].page, player[pn].x, player[pn].y-TILEWH, 24, 96, 24, 32, PLAYERBMPDATAPTR);
-#else
-				modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 10);
-#endif
-				if(!pageflipflop) modexShowPage(pip[1].page);
-				player[pn].d = 2;
-			}
-			player[pn].triggerx = player[pn].tx-1;
-			player[pn].triggery = player[pn].ty;
-		break;
-
-		//down movement
-		case 4:
-			if(pip[0].ty >= 0 && pip[0].ty+pip[0].page->th < pip[0].map->height && player[pn].ty == pip[0].ty+pip[0].page->tilemidposscreeny &&
-			!(pip[0].map->data[(player[pn].tx-1)+(pip[0].map->width*(player[pn].ty))] == 0))//!(player[pn].tx == TRIGGX && player[pn].ty+1 == TRIGGY))	//collision detection!
-			{
-				if(player[pn].q<=player[pn].spt)
-				{
-					INC_PER_FRAME;
-					animatePlayer(pip, player, pn, 1);
-					ScrollDown(pip, player, 3, pn);
-					ScrollDown(pip, player, 2, pn);
-					//mapScrollDown(pip, player, !(pip[0].video->p), pn);
-					mapScrollDown(pip, player, (pip[0].video->p), pn);
-					if(!pageflipflop) modexShowPage(pip[1].page);
-					player[pn].q++;
-					//0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;
-				} else { player[pn].q = 1; player[pn].d = 2; player[pn].ty++; }
-			}
-			else if(player[pn].ty < pip[0].map->height && !(pip[0].map->data[(player[pn].tx-1)+(pip[0].map->width*(player[pn].ty))] == 0))//!(player[pn].tx == TRIGGX && player[pn].ty+1 == TRIGGY))
-			{
-				if(player[pn].q<=player[pn].spt)
-				{
-					INC_PER_FRAME;
-					player[pn].y+=(player[pn].speed);
-					animatePlayer(pip, player, pn, 0);
-					if(!pageflipflop) modexShowPage(pip[1].page);
-					player[pn].q++;
-				} else { player[pn].q = 1; player[pn].d = 2; player[pn].ty++; }
-			}
-			else
-			{
-				if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x, player[pn].y-TILEWH, player[pn].x, player[pn].y-TILEWH, 24, 32);
-#ifdef SPRITE
-				modexDrawSpriteRegion(pip[0].page, player[pn].x, player[pn].y-TILEWH, 24, 64, 24, 32, PLAYERBMPDATAPTR);
-#else
-				modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 9);
-#endif
-				if(!pageflipflop) modexShowPage(pip[1].page);
-				player[pn].d = 2;
-			}
-			player[pn].triggerx = player[pn].tx;
-			player[pn].triggery = player[pn].ty+1;
-		break;
-
-		//up movement
-		case 0:
-			if(pip[0].ty > 0 && pip[0].ty+pip[0].page->th <= pip[0].map->height && player[pn].ty == pip[0].ty+pip[0].page->tilemidposscreeny &&
-			!(pip[0].map->data[(player[pn].tx-1)+(pip[0].map->width*(player[pn].ty-2))] == 0))//!(player[pn].tx == TRIGGX && player[pn].ty-1 == TRIGGY))	//collision detection!
-			{
-				if(player[pn].q<=player[pn].spt)
-				{
-					INC_PER_FRAME;
-					animatePlayer(pip, player, pn, 1);
-					ScrollUp(pip, player, 3, pn);
-					ScrollUp(pip, player, 2, pn);
-					//mapScrollUp(pip, player, !(pip[0].video->p), pn);
-					mapScrollUp(pip, player, (pip[0].video->p), pn);
-					if(!pageflipflop) modexShowPage(pip[1].page);
-					player[pn].q++;
-					//0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;
-				} else { player[pn].q = 1; player[pn].d = 2; player[pn].ty--; }
-			}
-			else if(player[pn].ty > 1 && !(pip[0].map->data[(player[pn].tx-1)+(pip[0].map->width*(player[pn].ty-2))] == 0))//!(player[pn].tx == TRIGGX &&  player[pn].ty-1 == TRIGGY))
-			{
-				if(player[pn].q<=player[pn].spt)
-				{
-					INC_PER_FRAME;
-					player[pn].y-=(player[pn].speed);
-					animatePlayer(pip, player, 0, pn);
-					if(!pageflipflop) modexShowPage(pip[1].page);
-					player[pn].q++;
-				} else { player[pn].q = 1; player[pn].d = 2; player[pn].ty--; }
-			}
-			else
-			{
-				if(!pageflipflop) modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x, player[pn].y-TILEWH, player[pn].x, player[pn].y-TILEWH, 24, 32);
-#ifdef SPRITE
-				modexDrawSpriteRegion(pip[0].page, player[pn].x, player[pn].y-TILEWH, 24, 0, 24, 32, PLAYERBMPDATAPTR);
-#else
-				modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 12);
-#endif
-				if(!pageflipflop) modexShowPage(pip[1].page);
-				player[pn].d = 2;
-			}
-			player[pn].triggerx = player[pn].tx;
-			player[pn].triggery = player[pn].ty-1;
-		break;
-	}
-}
-
-
-/*
-src/lib/scroll16.c:	mv[0].video->r=1;
-src/lib/scroll16.c:	mv[0].video->r=1;
-src/lib/scroll16.c:	mv[0].video->r=1;
-src/lib/scroll16.c:	mv[0].video->r=1;
-src/lib/scroll16.c:	pip->video->r=1;
-src/lib/scroll16.c:	mv->video->r=1;
- */
+//#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;
 
 void ZC_walk(map_view_t *pip, player_t *player, word pn)
 {
-	#define INC_PER_FRAME if(player[pn].q&1) player[pn].persist_aniframe++; if(player[pn].persist_aniframe>4) player[pn].persist_aniframe = 1;
-	switch(player[pn].d)
+	switch(player[pn].enti.d)
 	{
 		//no direction
 		case 2:
@@ -234,214 +36,195 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
 		break;
 		//right movement
 		case 3:
-			if(pip[0].tx >= 0 && pip[0].tx+pip[0].page->tw < pip[0].map->width && player[pn].tx == pip[0].tx+pip[0].page->tilemidposscreenx &&
-			!(pip[0].map->data[(player[pn].tx)+(pip[0].map->width*(player[pn].ty-1))] == 0))//!(player[pn].tx+1 == TRIGGX && player[pn].ty == TRIGGY))	//collision detection!
+			if(pip[0].tx >= 0 && pip[0].tx+pip[0].page->ti.tw < pip[0].map->width && player[pn].enti.tx == pip[0].tx+pip[0].page->ti.tilemidposscreenx &&
+			!(pip[0].map->data[(player[pn].enti.tx)+(pip[0].map->width*(player[pn].enti.ty-1))] == 0))//!(player[pn].enti.tx+1 == TRIGGX && player[pn].enti.ty == TRIGGY))	//collision detection!
 			{
-				if(player[pn].q<=player[pn].spt)
+				player[pn].walktype=2;
+				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
-					INC_PER_FRAME;
-					animatePlayer(pip, player, pn, 1);
-					ScrollRight(pip, player, 3, pn);
-					ScrollRight(pip, player, 2, pn);
-					mapScrollRight(pip, player, (pip[0].video->p), pn);
-					player[pn].q++;
+					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;
-				} else { player[pn].q = 1; player[pn].d = 2; player[pn].tx++; }
+				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx++; }
 			}
-			else if(player[pn].tx < pip[0].map->width && !(pip[0].map->data[(player[pn].tx)+(pip[0].map->width*(player[pn].ty-1))] == 0))//!(player[pn].tx+1 == TRIGGX && player[pn].ty == TRIGGY))
+			else if(player[pn].enti.tx < pip[0].map->width && !(pip[0].map->data[(player[pn].enti.tx)+(pip[0].map->width*(player[pn].enti.ty-1))] == 0))//!(player[pn].enti.tx+1 == TRIGGX && player[pn].enti.ty == TRIGGY))
 			{
-				if(player[pn].q<=player[pn].spt)
+				player[pn].walktype=1;
+				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
-					INC_PER_FRAME;
-					player[pn].x+=(player[pn].speed);
-					animatePlayer(pip, player, pn, 0);
-					player[pn].q++;
-				} else { player[pn].q = 1; player[pn].d = 2; player[pn].tx++; }
+					player[pn].enti.x+=(player[pn].enti.speed);
+					ZC_animatePlayer(pip, player, pn);
+					player[pn].enti.q++;
+				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx++; }
 			}
 			else
 			{
-#ifdef SPRITE
-				modexDrawSpriteRegion(pip[0].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 24, 32, PLAYERBMPDATAPTR);
-#else
-				modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 14);
-#endif
-				player[pn].d = 2;
+				player[pn].walktype=0;
+				ZC_animatePlayer(pip, player, pn);
+				player[pn].enti.d = 2;
 			}
-			player[pn].triggerx = player[pn].tx+1;
-			player[pn].triggery = player[pn].ty;
+			player[pn].enti.triggerx = player[pn].enti.tx+1;
+			player[pn].enti.triggery = player[pn].enti.ty;
 		break;
 		//left movement
 		case 1:
-			if(pip[0].tx > 0 && pip[0].tx+pip[0].page->tw <= pip[0].map->width && player[pn].tx == pip[0].tx+pip[0].page->tilemidposscreenx &&
-			!(pip[0].map->data[(player[pn].tx-2)+(pip[0].map->width*(player[pn].ty-1))] == 0))//!(player[pn].tx-1 == TRIGGX && player[pn].ty == TRIGGY))	//collision detection!
+			if(pip[0].tx > 0 && pip[0].tx+pip[0].page->ti.tw <= pip[0].map->width && player[pn].enti.tx == pip[0].tx+pip[0].page->ti.tilemidposscreenx &&
+			!(pip[0].map->data[(player[pn].enti.tx-2)+(pip[0].map->width*(player[pn].enti.ty-1))] == 0))//!(player[pn].enti.tx-1 == TRIGGX && player[pn].enti.ty == TRIGGY))	//collision detection!
 			{
-				if(player[pn].q<=player[pn].spt)
+				player[pn].walktype=2;
+				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
-					INC_PER_FRAME;
-					animatePlayer(pip, player, pn, 1);
-					ScrollLeft(pip, player, 3, pn);
-					ScrollLeft(pip, player, 2, pn);
-					mapScrollLeft(pip, player, (pip[0].video->p), pn);
-					player[pn].q++;
+					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;
-				} else { player[pn].q = 1; player[pn].d = 2; player[pn].tx--; }
+				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx--; }
 			}
-			else if(player[pn].tx > 1 && !(pip[0].map->data[(player[pn].tx-2)+(pip[0].map->width*(player[pn].ty-1))] == 0))//!(player[pn].tx-1 == TRIGGX && player[pn].ty == TRIGGY))
+			else if(player[pn].enti.tx > 1 && !(pip[0].map->data[(player[pn].enti.tx-2)+(pip[0].map->width*(player[pn].enti.ty-1))] == 0))//!(player[pn].enti.tx-1 == TRIGGX && player[pn].enti.ty == TRIGGY))
 			{
-				if(player[pn].q<=player[pn].spt)
+				player[pn].walktype=1;
+				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
-					INC_PER_FRAME;
-					player[pn].x-=(player[pn].speed);
-					animatePlayer(pip, player, pn, 0);
-					player[pn].q++;
-				} else { player[pn].q = 1; player[pn].d = 2; player[pn].tx--; }
+					player[pn].enti.x-=(player[pn].enti.speed);
+					ZC_animatePlayer(pip, player, pn);
+					player[pn].enti.q++;
+				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx--; }
 			}
 			else
 			{
-#ifdef SPRITE
-				modexDrawSpriteRegion(pip[0].page, player[pn].x, player[pn].y-TILEWH, 24, 96, 24, 32, PLAYERBMPDATAPTR);
-#else
-				modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 10);
-#endif
-				player[pn].d = 2;
+				player[pn].walktype=0;
+				ZC_animatePlayer(pip, player, pn);
+				player[pn].enti.d = 2;
 			}
-			player[pn].triggerx = player[pn].tx-1;
-			player[pn].triggery = player[pn].ty;
+			player[pn].enti.triggerx = player[pn].enti.tx-1;
+			player[pn].enti.triggery = player[pn].enti.ty;
 		break;
 		//down movement
 		case 4:
-			if(pip[0].ty >= 0 && pip[0].ty+pip[0].page->th < pip[0].map->height && player[pn].ty == pip[0].ty+pip[0].page->tilemidposscreeny &&
-			!(pip[0].map->data[(player[pn].tx-1)+(pip[0].map->width*(player[pn].ty))] == 0))//!(player[pn].tx == TRIGGX && player[pn].ty+1 == TRIGGY))	//collision detection!
+			if(pip[0].ty >= 0 && pip[0].ty+pip[0].page->ti.th < pip[0].map->height && player[pn].enti.ty == pip[0].ty+pip[0].page->ti.tilemidposscreeny &&
+			!(pip[0].map->data[(player[pn].enti.tx-1)+(pip[0].map->width*(player[pn].enti.ty))] == 0))//!(player[pn].enti.tx == TRIGGX && player[pn].enti.ty+1 == TRIGGY))	//collision detection!
 			{
-				if(player[pn].q<=player[pn].spt)
+				player[pn].walktype=2;
+				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
-					INC_PER_FRAME;
-					animatePlayer(pip, player, pn, 1);
-					ScrollDown(pip, player, 3, pn);
-					ScrollDown(pip, player, 2, pn);
-					mapScrollDown(pip, player, (pip[0].video->p), pn);
-					player[pn].q++;
+					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;
-				} else { player[pn].q = 1; player[pn].d = 2; player[pn].ty++; }
+				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty++; }
 			}
-			else if(player[pn].ty < pip[0].map->height && !(pip[0].map->data[(player[pn].tx-1)+(pip[0].map->width*(player[pn].ty))] == 0))//!(player[pn].tx == TRIGGX && player[pn].ty+1 == TRIGGY))
+			else if(player[pn].enti.ty < pip[0].map->height && !(pip[0].map->data[(player[pn].enti.tx-1)+(pip[0].map->width*(player[pn].enti.ty))] == 0))//!(player[pn].enti.tx == TRIGGX && player[pn].enti.ty+1 == TRIGGY))
 			{
-				if(player[pn].q<=player[pn].spt)
+				player[pn].walktype=1;
+				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
-					INC_PER_FRAME;
-					player[pn].y+=(player[pn].speed);
-					animatePlayer(pip, player, pn, 0);
-					player[pn].q++;
-				} else { player[pn].q = 1; player[pn].d = 2; player[pn].ty++; }
+					player[pn].enti.y+=(player[pn].enti.speed);
+					ZC_animatePlayer(pip, player, pn);
+					player[pn].enti.q++;
+				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty++; }
 			}
 			else
 			{
-#ifdef SPRITE
-				modexDrawSpriteRegion(pip[0].page, player[pn].x, player[pn].y-TILEWH, 24, 64, 24, 32, PLAYERBMPDATAPTR);
-#else
-				modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 9);
-#endif
-				player[pn].d = 2;
+				player[pn].walktype=0;
+				ZC_animatePlayer(pip, player, pn);
+				player[pn].enti.d = 2;
 			}
-			player[pn].triggerx = player[pn].tx;
-			player[pn].triggery = player[pn].ty+1;
+			player[pn].enti.triggerx = player[pn].enti.tx;
+			player[pn].enti.triggery = player[pn].enti.ty+1;
 		break;
 		//up movement
 		case 0:
-			if(pip[0].ty > 0 && pip[0].ty+pip[0].page->th <= pip[0].map->height && player[pn].ty == pip[0].ty+pip[0].page->tilemidposscreeny &&
-			!(pip[0].map->data[(player[pn].tx-1)+(pip[0].map->width*(player[pn].ty-2))] == 0))//!(player[pn].tx == TRIGGX && player[pn].ty-1 == TRIGGY))	//collision detection!
+			if(pip[0].ty > 0 && pip[0].ty+pip[0].page->ti.th <= pip[0].map->height && player[pn].enti.ty == pip[0].ty+pip[0].page->ti.tilemidposscreeny &&
+			!(pip[0].map->data[(player[pn].enti.tx-1)+(pip[0].map->width*(player[pn].enti.ty-2))] == 0))//!(player[pn].enti.tx == TRIGGX && player[pn].enti.ty-1 == TRIGGY))	//collision detection!
 			{
-				if(player[pn].q<=player[pn].spt)
+				player[pn].walktype=2;
+				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
-					INC_PER_FRAME;
-					animatePlayer(pip, player, pn, 1);
-					ScrollUp(pip, player, 3, pn);
-					ScrollUp(pip, player, 2, pn);
-					mapScrollUp(pip, player, (pip[0].video->p), pn);
-					player[pn].q++;
+					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;
-				} else { player[pn].q = 1; player[pn].d = 2; player[pn].ty--; }
+				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty--; }
 			}
-			else if(player[pn].ty > 1 && !(pip[0].map->data[(player[pn].tx-1)+(pip[0].map->width*(player[pn].ty-2))] == 0))//!(player[pn].tx == TRIGGX &&  player[pn].ty-1 == TRIGGY))
+			else if(player[pn].enti.ty > 1 && !(pip[0].map->data[(player[pn].enti.tx-1)+(pip[0].map->width*(player[pn].enti.ty-2))] == 0))//!(player[pn].enti.tx == TRIGGX &&  player[pn].enti.ty-1 == TRIGGY))
 			{
-				if(player[pn].q<=player[pn].spt)
+				player[pn].walktype=1;
+				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
-					INC_PER_FRAME;
-					player[pn].y-=(player[pn].speed);
-					animatePlayer(pip, player, 0, pn);
-					player[pn].q++;
-				} else { player[pn].q = 1; player[pn].d = 2; player[pn].ty--; }
+					player[pn].enti.y-=(player[pn].enti.speed);
+					ZC_animatePlayer(pip, player, pn);
+					player[pn].enti.q++;
+				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty--; }
 			}
 			else
 			{
-#ifdef SPRITE
-				modexDrawSpriteRegion(pip[0].page, player[pn].x, player[pn].y-TILEWH, 24, 0, 24, 32, PLAYERBMPDATAPTR);
-#else
-				modexClearRegion(pip[1].page, player[pn].x, player[pn].y-TILEWH, 24, 32, 12);
-#endif
-				player[pn].d = 2;
+				player[pn].walktype=0;
+				ZC_animatePlayer(pip, player, pn);
+				player[pn].enti.d = 2;
 			}
-			player[pn].triggerx = player[pn].tx;
-			player[pn].triggery = player[pn].ty-1;
+			player[pn].enti.triggerx = player[pn].enti.tx;
+			player[pn].enti.triggery = player[pn].enti.ty-1;
 		break;
 	}
 }
 
+
 //panning page
 void ZC_panPageManual(map_view_t *pip, player_t *player, word pn)
 {
 #define SHOWMVFUN_ ZC_ShowMV(pip, 0, 0);
-	switch(player[pn].d)
+	switch(player[pn].enti.d)
 	{
 		//right movement
 		case 3:
-			if(pip[0].tx >= 0 && pip[0].tx+pip[0].page->tw < pip[0].page->tilesw)
+			if(pip[0].tx >= 0 && pip[0].tx+pip[0].page->ti.tw < pip[0].page->ti.tilesw)
 			{
-				if(player[pn].q<=player[pn].spt)
+				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
 					pip[0].page->dx+=4;
 					SHOWMVFUN_;
-					player[pn].q++;
-				} else { player[pn].q = 1; player[pn].d = 2; pip[0].tx++; }
+					player[pn].enti.q++;
+				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; pip[0].tx++; }
 			}
 		break;
 
 		//left movement
 		case 1:
-			if(pip[0].tx > 0 && pip[0].tx+pip[0].page->tw <= pip[0].page->tilesw)
+			if(pip[0].tx > 0 && pip[0].tx+pip[0].page->ti.tw <= pip[0].page->ti.tilesw)
 			{
-				if(player[pn].q<=player[pn].spt)
+				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
 					pip[0].page->dx-=4;
 					SHOWMVFUN_;
-					player[pn].q++;
-				} else { player[pn].q = 1; player[pn].d = 2; pip[0].tx--; }
+					player[pn].enti.q++;
+				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; pip[0].tx--; }
 			}
 		break;
 
 		//down movement
 		case 4:
-			if(pip[0].ty >= 0 && pip[0].ty+pip[0].page->th < pip[0].page->tilesh)
+			if(pip[0].ty >= 0 && pip[0].ty+pip[0].page->ti.th < pip[0].page->ti.tilesh)
 			{
-				if(player[pn].q<=player[pn].spt)
+				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
 					pip[0].page->dy+=4;
 					SHOWMVFUN_;
-					player[pn].q++;
-				} else { player[pn].q = 1; player[pn].d = 2; pip[0].ty++; }
+					player[pn].enti.q++;
+				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; pip[0].ty++; }
 			}
 		break;
 
 		//up movement
 		case 0:
-			if(pip[0].ty > 0 && pip[0].ty+pip[0].page->th <= pip[0].page->tilesh)
+			if(pip[0].ty > 0 && pip[0].ty+pip[0].page->ti.th <= pip[0].page->ti.tilesh)
 			{
-				if(player[pn].q<=player[pn].spt)
+				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
 					pip[0].page->dy-=4;
 					SHOWMVFUN_;
-					player[pn].q++;
-				} else { player[pn].q = 1; player[pn].d = 2; pip[0].ty--; }
+					player[pn].enti.q++;
+				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; pip[0].ty--; }
 			}
 		break;
 	}
@@ -458,7 +241,8 @@ void ZC_MVSetup(map_view_t *pip, map_t *map, global_game_variables_t *gv)
 	pip[0].page = &gv->video.page[0];
 	pip[0].map = map;
 	pip[0].video = &gv->video;
-	pip[0].panp	= &gv->video.panp;
+	pip[0].p	= &gv->video.p;
+	pip[0].sp	= &gv->video.sp;
 	ZC_MVInit(pip, 1, 1);
 
 	for(i=ZC_MVI;i<gv->video.num_of_pages;i++)
@@ -466,7 +250,8 @@ void ZC_MVSetup(map_view_t *pip, map_t *map, global_game_variables_t *gv)
 		pip[i].page	=	&gv->video.page[i];
 		pip[i].map	=	pip[0].map;
 		pip[i].video	=	pip[0].video;
-		pip[i].panp	=	pip[0].panp;
+		pip[i].p	=	pip[0].p;
+		pip[i].sp	=	pip[0].sp;
 //		if(i>ZC_MVI) {
 		pip[i].tx =	1;
 		pip[i].ty =	1;
@@ -487,16 +272,16 @@ void ZC_ShowMV(map_view_t *moo, boolean vsync, boolean sr)
 	word high_address, low_address, offset;
 	byte crtcOffset;
 
-	/* calculate offset */
-	offset = (word) moo[moo[0].video->panp].page->data;
+	// calculate offset
+	offset = (word) moo[moo[0].video->sp].page->data;
 	offset += moo[0].page->dy * (moo[0].page->width >> 2 );
 	offset += moo[0].page->dx >> 2;
 
-	/* calculate crtcOffset according to virtual width */
+	// calculate crtcOffset according to virtual width
 	switch(sr)
 	{
 		case 1:
-			crtcOffset = moo[0].page->sw >> 3;
+			crtcOffset = moo[moo[0].video->sp].page->sw >> 3;
 		break;
 		default:
 		case 0:
@@ -507,135 +292,63 @@ void ZC_ShowMV(map_view_t *moo, boolean vsync, boolean sr)
 	high_address = HIGH_ADDRESS | (offset & 0xff00);
 	low_address  = LOW_ADDRESS  | (offset << 8);
 
-	/* wait for appropriate timing and then program CRTC */
+	// wait for appropriate timing and then program CRTC
 	if(vsync) while ((inp(INPUT_STATUS_1) & DISPLAY_ENABLE));
 	outpw(CRTC_INDEX, high_address);
 	outpw(CRTC_INDEX, low_address);
 	outp(CRTC_INDEX, 0x13);
 	outp(CRTC_DATA, crtcOffset);
 
-	/* wait for one retrace */
+	// wait for one retrace
 	if(vsync) while (!(inp(INPUT_STATUS_1) & VRETRACE));
 
-	/* do PEL panning here */
+	// do PEL panning here
 	outp(AC_INDEX, 0x33);
 	outp(AC_INDEX, (moo[0].page->dx & 0x03) << 1);
+	vga_state.vga_draw_stride_limit = vga_state.vga_draw_stride = moo[0].page->stridew;
 }
 
-/*map_t
-allocMap(int w, int h) {
-	map_t result;
-
-	result.width =w;
-	result.height=h;
-	result.data = malloc(sizeof(byte) * w * h);
-	//result.data = (byte *)alloc_emem(((int)sizeof(byte) * w * h)/1024);
-	if(isEMS() || checkEMS())
-	{
-		XMOVE mm;
-		//emmhandle = mallocEMS(coretotalEMS());//alloc_emem((int)sizeof(map))
-		mm.length=sizeof(result);
-		mm.sourceH=0;
-		mm.sourceOff=ptr2long(&result);
-		mm.destH=emmhandle;
-		mm.destOff=0;
-		ist = move_emem(&mm);
-		if(!ist){ dealloc_emem(emmhandle); exit(5); }
-		printf("%d\n", coretotalEMS());
-	}
-
-	return result;
-}*/
-
-/*void
+void
 initMap(map_t *map) {
 	// just a place holder to fill out an alternating pattern
-	int x, y, xx, yy;
-	int i, q;
-//	int tile = 1;
-	//if(!isEMS() || !checkEMS())
-//		map->tiles = malloc(sizeof(tiles_t));
-	//else
-	//	map->tiles = (tiles_t *)alloc_emem(sizeof(tiles_t));
-
-	 //create the tile set
-	//if(!isEMS() || !checkEMS())
-//		map->tiles->data = malloc(sizeof(bitmap_t));
-	//else
-	//	map->tiles->data = (bitmap_t *)alloc_emem(sizeof(bitmap_t));
-//	map->tiles->data->width = (TILEWH);
-//	map->tiles->data->height= TILEWH;
-	//if(!isEMS() || !checkEMS())
-//		map->tiles->data->data = malloc((TILEWH*2)*TILEWH);
-	//else
-	//	map->tiles->data->data = (byte *)alloc_emem((TILEWH*2)*TILEWH);
-//	map->tiles->tileHeight = TILEWH;
-//	map->tiles->tileWidth =TILEWH;
-//	map->tiles->rows = 1;
-//	map->tiles->cols = 1;//2;
-
-	q=0;
-	//for(y=0; y<map->height; y++) {
-	//for(x=0; x<map->width; x++) {
-	i=0;
-	for(yy=0; yy<TILEWH; yy++) {
-	for(xx=0; xx<(TILEWH); xx++) {
-		//if(x<TILEWH){
-		  map->tiles->data->data[i+1] = map->data[q];//28;//0x24;
-//		  printf("[%d]", map->tiles->data->data[i]);
-		//}else{
-		  //map->tiles->data->data[i] = map->data[q];//0;//0x34;
-		  //printf("]%d[==[%d]", i, map->tiles->data->data[i]);
-		//}
-		i++;
-	}
-//	printf("\n");
-	}
-//	printf("[%d]", map->data[q]);
-	q++;
-//	}
-	//printf("\n\n");
-//	}
+	int x, y;
+	int i;
+	int tile = 1;
 
 	i=0;
 	for(y=0; y<map->height; y++) {
 		for(x=0; x<map->width; x++) {
-//			map->data[i]=255;
-			printf("[%d]", map->data[i]);
-			//tile = tile ? 0 : 1;
+			map->data[i]=255;
+//			printf("[%d]", map->data[i]);
+			tile = tile ? 0 : 1;
 			i++;
 		}
-		//tile = tile ? 0 : 1;
+		tile = tile ? 0 : 1;
 	}
-}*/
+}
+
+//===========================================================================//
+
 
 void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid)
 {
 	word x;//, y;  /* coordinate for drawing */
 
-	/* increment the pixel position and update the page */
-	mv[id].page[0].dx += player[plid].speed;
-
-	/* check to see if this changes the tile */
-	if(mv[id].page[0].dx >= mv[id].dxThresh )
-	{
-	/* go forward one tile */
-	mv[id].tx++;
-	/* Snap the origin forward */
-	mv[id].page->data += 4;
-
-	mv[id].page[0].dx = mv[id].map->tiles->tileWidth;
-	}
+	ScrollRight(mv, player, id, plid);
 
 	/* draw the next column */
-	x= mv[0].page->sw + mv[id].map->tiles->tileWidth;
-	if(player[plid].q%4)
-		if(id==0)
-			mapDrawCol(&mv[0], mv[0].tx + mv[0].page->tw, mv[0].ty-1, x, player, mv->page[0].dx);
-		else
-			if(!pageflipflop && !pageploop)
-				modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*(mv[0].page->th+2));
-	mv[0].video->r=1;
+	x= mv[0].page->sw + mv[0].map->tiles->tileWidth;
+#ifndef FULLRCREND
+	if(player[plid].enti.q%4)
+#else
+	if(player[plid].enti.q==4)
+#endif
+//		if(id==0)
+			mapDrawCol(&mv[id], mv[0].tx + mv[0].page->ti.tw, mv[0].ty-1, x, player, DRAWCOLNUM);
+//		else
+//			if(mv[0].video->bgps)
+//				modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[0].map->tiles->tileWidth, mv[0].page->height);
+	mv[0].video->dorender=1;
 }
 
 
@@ -643,29 +356,21 @@ void near mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid)
 {
 	word x;//,y;  /* coordinate for drawing */
 
-	/* decrement the pixel position and update the page */
-	mv[id].page[0].dx -= player[plid].speed;
-
-	/* check to see if this changes the tile */
-	if(mv[id].page[0].dx == 0)
-	{
-	/* go backward one tile */
-	mv[id].tx--;
-	/* Snap the origin backward */
-	mv[id].page->data -= 4;
-
-	mv[id].page[0].dx = mv[id].map->tiles->tileWidth;
-	}
+	ScrollLeft(mv, player, id, plid);
 
 	/* draw the next column */
 	x= 0;
-	if(player[plid].q%4)
-		if(id==0)
-			mapDrawCol(&mv[0], mv[0].tx - 1, mv[0].ty-1, x, player, mv->page[0].dx);
-		else
-			if(!pageflipflop && !pageploop)
-				modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*(mv[0].page->th+2));
-	mv[0].video->r=1;
+#ifndef FULLRCREND
+	if(player[plid].enti.q%4)
+#else
+	if(player[plid].enti.q==4)
+#endif
+//		if(id==0)
+			mapDrawCol(&mv[id], mv[0].tx - 1, mv[0].ty-1, x, player, DRAWCOLNUM);
+//		else
+//			if(mv[0].video->bgps)
+//				modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[0].map->tiles->tileWidth, mv[0].page->height);
+	mv[0].video->dorender=1;
 }
 
 
@@ -673,137 +378,97 @@ void near mapScrollUp(map_view_t *mv, player_t *player, word id, word plid)
 {
 	word y;//x,  /* coordinate for drawing */
 
-	/* decrement the pixel position and update the page */
-	mv[id].page[0].dy -= player[plid].speed;
-
-	/* check to see if this changes the tile */
-	if(mv[id].page[0].dy == 0 )
-	{
-	/* go down one tile */
-	mv[id].ty--;
-	/* Snap the origin downward */
-	mv[id].page->data -= mv[id].page->pi;
-
-	mv[id].page[0].dy = mv[id].map->tiles->tileHeight;
-	}
+	ScrollUp(mv, player, id, plid);
 
 	/* draw the next row */
 	y= 0;
-	if(player[plid].q%3)
-		if(id==0)
-			mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty-1, y, player, mv->page[0].dy);
-		else
-			if(!pageflipflop && !pageploop)
-				modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*(mv[0].page->tw+2), mv[id].map->tiles->tileHeight);
-	mv[0].video->r=1;
+#ifndef FULLRCREND
+	if(player[plid].enti.q%3)
+#else
+	if(player[plid].enti.q==4)
+#endif
+//		if(id==0)
+			mapDrawRow(&mv[id], mv[0].tx - 1, mv[0].ty-1, y, player, DRAWROWNUM);
+//		else
+//			if(mv[0].video->bgps)
+//				modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[0].page->width, mv[0].map->tiles->tileHeight);
+	mv[0].video->dorender=1;
 }
 
+
 void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid)
 {
 	word y;//x,  /* coordinate for drawing */
 
-	/* increment the pixel position and update the page */
-	mv[id].page[0].dy += player[plid].speed;
-
-	/* check to see if this changes the tile */
-	if(mv[id].page[0].dy >= mv[id].dyThresh )
-	{
-	/* go down one tile */
-	mv[id].ty++;
-	/* Snap the origin downward */
-	mv[id].page->data += mv[id].page->pi;
-
-	mv[id].page[0].dy = mv[id].map->tiles->tileHeight;
-	}
+	ScrollDown(mv, player, id, plid);
 
 	/* draw the next row */
-	y= mv[0].page->sh + mv[id].map->tiles->tileHeight;
-	if(player[plid].q%3)
-		if(id==0)
-			mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty+mv[0].page->th, y, player, mv->page[0].dy);
-		else
-			if(!pageflipflop && !pageploop)
-				modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*(mv[0].page->tw+2), mv[id].map->tiles->tileHeight);
-	mv[0].video->r=1;
-}
-
-
-//TODO finish this wwww
-void near ScrollRight(map_view_t *mv, player_t *player, word id, word plid)
-{
-	/* increment the pixel position and update the page */
-	mv[id].page->dx += player[plid].speed;
-
-	/* check to see if this changes the tile */
-	if(mv[id].page->dx >= mv[0].dxThresh )
-	{
-// 		vga_setup_wm1_block_copy();
-// 		_fmemmove(mv[id].page->data+4, mv[id].page->data, mv[id].page->pagesize);
-// 		vga_restore_rm0wm0();
-		/* Snap the origin forward */
-		mv[id].page->data += 4;
-		mv[id].page->dx = mv[0].map->tiles->tileWidth;
-	}
-}
-
-void near ScrollLeft(map_view_t *mv, player_t *player, word id, word plid)
-{
-	/* decrement the pixel position and update the page */
-	mv[id].page->dx -= player[plid].speed;
-
-	/* check to see if this changes the tile */
-	if(mv[id].page->dx == 0)
-	{
-// 		vga_setup_wm1_block_copy();
-// 		_fmemmove(mv[id].page->data-4, mv[id].page->data, mv[id].page->pagesize);
-// 		vga_restore_rm0wm0();
-		/* Snap the origin backward */
-		mv[id].page->data -= 4;
-		mv[id].page->dx = mv[0].map->tiles->tileWidth;
-	}
-}
-
-void near ScrollUp(map_view_t *mv, player_t *player, word id, word plid)
-{
-	/* decrement the pixel position and update the page */
-	mv[id].page->dy -= player[plid].speed;
-
-	/* check to see if this changes the tile */
-	if(mv[id].page->dy == 0)
-	{
-// 		vga_setup_wm1_block_copy();
-// 		_fmemmove(mv[id].page->data-mv[id].page->pi, mv[id].page->data, mv[id].page->pagesize);
-// 		vga_restore_rm0wm0();
-		/* Snap the origin backward */
-		mv[id].page->data -= mv[id].page->pi;
-		mv[id].page->dy = mv[0].map->tiles->tileWidth;
-	}
+	y= mv[0].page->sh + mv[0].map->tiles->tileHeight;
+#ifndef FULLRCREND
+	if(player[plid].enti.q%3)
+#else
+	if(player[plid].enti.q==4)
+#endif
+//		if(id==0)
+			mapDrawRow(&mv[id], mv[0].tx - 1, mv[0].ty+mv[0].page->ti.th, y, player, DRAWROWNUM);
+//		else
+//			if(mv[0].video->bgps)
+//				modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[0].page->width, mv[0].map->tiles->tileHeight);
+	mv[0].video->dorender=1;
 }
 
-void near ScrollDown(map_view_t *mv, player_t *player, word id, word plid)
+void ZC_mapScroll(map_view_t *mv, player_t *player, word pn)
 {
-	/* increment the pixel position and update the page */
-	mv[id].page->dy += player[plid].speed;
-
-	/* check to see if this changes the tile */
-	if(mv[id].page->dy >= mv[0].dxThresh )
+	word b = mv[0].video->bgps;
+	switch(player[pn].enti.d)
 	{
-// 		vga_setup_wm1_block_copy();
-// 		_fmemmove(mv[id].page->data+mv[id].page->pi, mv[id].page->data, mv[id].page->pagesize);
-// 		vga_restore_rm0wm0();
-		/* Snap the origin forward */
-		mv[id].page->data += mv[id].page->pi;
-		mv[id].page->dy = mv[0].map->tiles->tileWidth;
+		case 2://none
+		break;
+		case 3://right
+				ScrollRight(mv, player, 3, pn);
+				ScrollRight(mv, player, 2, pn);
+				mapScrollRight(mv, player, (0), pn);
+			if(b)	mapScrollRight(mv, player, (1), pn);
+		break;
+		case 1://left
+				ScrollLeft(mv, player, 3, pn);
+				ScrollLeft(mv, player, 2, pn);
+				mapScrollLeft(mv, player, (0), pn);
+			if(b)	mapScrollLeft(mv, player, (1), pn);
+		break;
+		case 4://down
+				ScrollDown(mv, player, 3, pn);
+				ScrollDown(mv, player, 2, pn);
+				mapScrollDown(mv, player, (0), pn);
+			if(b)	mapScrollDown(mv, player, (1), pn);
+		break;
+		case 0://up
+				ScrollUp(mv, player, 3, pn);
+				ScrollUp(mv, player, 2, pn);
+				mapScrollUp(mv, player, (0), pn);
+			if(b)	mapScrollUp(mv, player, (1), pn);
+		break;
 	}
+	mv[0].video->dorender=1;
 }
 
 //===========================================================================
 //TODO: put player in starting position of assigned spot on map
 //default player position on the viewable map
-void playerXYpos(int x, int y, player_t *player, map_view_t *pip, nibble pn)
+void ZC_playerXYpos(int x, int y, player_t *player, map_view_t *pip, nibble pn, boolean defaultsw)
 {
-	player[pn].tx = x + pip[0].tx + pip[0].page->tilemidposscreenx;
-	player[pn].ty = y + pip[0].ty + pip[0].page->tilemidposscreeny;
+	player[pn].enti.tx = x + pip[0].tx;
+	player[pn].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;
+		break;
+		case 0:
+		break;
+	}
 }
 //===========================================================================
 
@@ -859,34 +524,16 @@ sword chkmap(map_t *map, word q)
 //TODO: player position here
 void mapGoTo(map_view_t *mv, int tx, int ty)
 {
-	int py;//px,
-	unsigned int i;
-
-	mapinitmapview(mv, tx, ty);
+	ZC_mapinitMV(mv, tx, ty);
 
 	/* draw the tiles */
 	modexClearRegion(mv[0].page, 0, 0, mv[0].page->width, mv[0].page->height, 0);
-	py=0;
-	i=mv[0].ty * mv[0].map->width + mv[0].tx;
-	for(ty=mv[0].ty-1; py < mv[0].page->sh+mv->dyThresh && ty < mv[0].map->height; ty++, py+=mv[0].map->tiles->tileHeight) {
-		mapDrawWRow(&mv[0], tx-1, ty, py);
-	i+=mv->map->width - tx;
-	}
-	if(!pageploop) modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height);
-// 	{
-// 		unsigned int k,j,o;
-// 		/* fill screen with a distinctive pattern */
-// 		for (k=0;k < vga_state.vga_width;k++) {
-// 			o = k >> 2;
-// 			vga_write_sequencer(0x02/*map mask*/,1 << (k&3));
-// 				for (j=0;j < (mv[0].page->height)+(mv[1].page->height)+(mv[2].page->height)+(mv[3].page->height);j++,o += vga_state.vga_stride)
-// 					vga_state.vga_graphics_ram[o] = (k^j)&15; // VRL samples put all colors in first 15!
-// 		}
-// 	}
-	modexCopyPageRegion(mv[3].page, mv[0].page, 0/**/, 0/**/, 0, 0, 24, 32);
+	ZC_mapredraw(mv, tx, ty);
+
+	//if(mv[0].video->bgps) modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height);
 }
 
-void mapinitmapview(map_view_t *mv, int tx, int ty)
+void ZC_mapinitMV(map_view_t *mv, int tx, int ty)
 {
 	/* set up the coordinates */
 	mv[0].tx = mv[1].tx = tx;
@@ -896,7 +543,21 @@ void mapinitmapview(map_view_t *mv, int tx, int ty)
 
 	/* set up the thresholds */
 	mv[0].dxThresh = mv[1].dxThresh = mv[2].dxThresh = mv[3].dxThresh = mv->map->tiles->tileWidth * 2;
-	mv[0].dyThresh = mv[1].dyThresh = mv[2].dxThresh = mv[3].dxThresh = mv->map->tiles->tileHeight * 2;
+	mv[0].dyThresh = mv[1].dyThresh = mv[2].dyThresh = mv[3].dyThresh = mv->map->tiles->tileHeight * 2;
+}
+
+void ZC_mapredraw(map_view_t *mv, int tx, int ty)
+{
+	int py;//px,
+	unsigned int i;
+
+	py=0;
+	i=mv[0].ty * mv[0].map->width + mv[0].tx;
+	for(ty=mv[0].ty-1; py < mv[0].page->sh+mv->dyThresh && ty < mv[0].map->height; ty++, py+=mv[0].map->tiles->tileHeight) {
+		mapDrawWRow(&mv[0], tx-1, ty, py);
+		mapDrawWRow(&mv[1], tx-1, ty, py);
+		i+=mv->map->width - tx;
+	}
 }
 
 void near
@@ -909,7 +570,7 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
 	if(i==0)
 	{
 		//wwww
-		modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, 0); //currently the over scan color!
+		modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, 1); //currently the over scan color!
 	}
 	else
 	{
@@ -922,7 +583,7 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
 			case 0:
 #endif
 #ifndef TILERENDER
-				modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, ((dbg_mapdata[i])+1));
+				if(!pagenorendermap) modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, ((dbg_mapdata[i])+1));
 				//modexprint(page, x, y, 1, 15, 0, (char const *)(t->debug_data[i]));
 #else
 				modexDrawBmpRegion		(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data));
@@ -948,62 +609,57 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
 	}
 }
 
-void near mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *p, word poopoffset)
+void near mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *player, word poopoffset)
 {
-	word x;
 	int i;
-	poopoffset%=p[0].speed;
+if(pagedelayrendermap)		if(!y)	y+=TILEWH;	else	y-=TILEWH;
+	poopoffset%=player[0].enti.speed;
 //printf("y: %d\n", poopoffset);
+if(pagedelayrendermap){ sprintf(global_temp_status_text, "%-3u", mv->dx); modexprint(mv[0].page, player[0].enti.x, player[0].enti.y-28-(poopoffset*8) , 1, 2, 1, global_temp_status_text); }
 	/* the position within the map array */
 	i=ty * mv->map->width + tx;
-	for(x=poopoffset; x<(mv->page->sw+mv->dxThresh)/(poopoffset+1) && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) {
-	if(i>=0) {
-		/* we are in the map, so copy! */
-		mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);
-	}
-	i++; /* next! */
+	for(	mv->dx=poopoffset;	mv->dx<(mv->page->sw+mv->dxThresh)/(poopoffset+1) && tx < mv->map->width;	mv->dx+=mv->map->tiles->tileWidth, tx++) {
+		if(i>=0)	/* we are in the map, so copy away! */
+			mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, mv->dx, y);
+		i++; /* next! */
 	}
+//if(pagedelayrendermap) delay(200);
 }
 
-void near mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *p, word poopoffset)
+void near mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *player, word poopoffset)
 {
-	int y;
 	int i;
-	poopoffset%=p[0].speed;
+if(pagedelayrendermap)		if(!x)	x+=TILEWH;		else	x-=TILEWH;
+	poopoffset%=player[0].enti.speed;
 //printf("x: %d\n", poopoffset);
+if(pagedelayrendermap){ sprintf(global_temp_status_text, "%-3u", mv->dy); modexprint(mv[0].page, player[0].enti.x, player[0].enti.y-28-(poopoffset*8) , 1, 2, 1, global_temp_status_text); }
 	/* location in the map array */
 	i=ty * mv->map->width + tx;
-
 	/* We'll copy all of the columns in the screen,
 	   i + 1 row above and one below */
-	for(y=poopoffset; y<(mv->page->sh+mv->dyThresh)/(poopoffset+1) && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) {
-	if(i>=0) {
-		/* we are in the map, so copy away! */
-		mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);
-	}
-	i += mv->map->width;
+	for(	mv->dy=poopoffset;	mv->dy<(mv->page->sh+mv->dyThresh)/(poopoffset+1) && ty < mv->map->height;	mv->dy+=mv->map->tiles->tileHeight, ty++) {
+		if(i>=0)	/* we are in the map, so copy away! */
+			mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, mv->dy);
+		i += mv->map->width;
 	}
+//if(pagedelayrendermap) delay(200);
 }
 
 void mapDrawWRow(map_view_t *mv, int tx, int ty, word y)
 {
-	word x;
 	int i;
 
 	/* the position within the map array */
 	i=ty * mv->map->width + tx;
-	for(x=0; x<mv->page->sw+mv->dxThresh && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) {
-	if(i>=0) {
-		/* we are in the map, so copy! */
-		mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);
-	}
-	i++; /* next! */
+	for(mv->dx=0; mv->dx<mv->page->sw+mv->dxThresh && tx < mv->map->width; mv->dx+=mv->map->tiles->tileWidth, tx++) {
+		if(i>=0)	/* we are in the map, so copy! */
+			mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, mv->dx, y);
+		i++; /* next! */
 	}
 }
 
 void mapDrawWCol(map_view_t *mv, int tx, int ty, word x)
 {
-	int y;
 	int i;
 
 	/* location in the map array */
@@ -1011,12 +667,10 @@ void mapDrawWCol(map_view_t *mv, int tx, int ty, word x)
 
 	/* We'll copy all of the columns in the screen,
 	   i + 1 row above and one below */
-	for(y=0; y<mv->page->sh+mv->dyThresh && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) {
-	if(i>=0) {
-		/* we are in the map, so copy away! */
-		mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);
-	}
-	i += mv->map->width;
+	for(mv->dy=0; mv->dy<mv->page->sh+mv->dyThresh && ty < mv->map->height; mv->dy+=mv->map->tiles->tileHeight, ty++) {
+		if(i>=0)	/* we are in the map, so copy away! */
+			mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, mv->dy);
+		i += mv->map->width;
 	}
 }
 
@@ -1025,173 +679,125 @@ void mapDrawWCol(map_view_t *mv, int tx, int ty, word x)
 	//setkb(0);
 }*/
 
-boolean pageflipflop = 1;
-boolean pageploop = 1;
+boolean pagenorendermap = 0;
+boolean pagedelayrendermap = 0;
 
 /*	sync	*/
 void shinku(global_game_variables_t *gv)
 {
 	word x = (0) + gv->video.page[/*!*/(gv->video.p)].dx; // follow the screen
 	word y = (0) + gv->video.page[/*!*/(gv->video.p)].dy; // follow the screen
-	word col = 7, bgcol = 0, type = 1;//w = 64, h = 8,
-	//byte o,o2,i;
-	//modexCopyPageRegion(pip[1].page, pip[2].page, 16, 16, 16, 16, (14*8)+4, 8+4);
-	/* block copy to visible RAM from offscreen */
-//	vga_setup_wm1_block_copy();
-//	modexCopyPageRegion(&(gv->video.page[gv->video->sfip]), &(gv->video.page[!gv->video->sfip]), x, y, x+w, 0, w, h);
-// 	o =	*(gv->video.page[2].data); // source offscreen
-// 	o2 =	*(gv->video.page[gv->video->sfip].data)+(y * vga_state.vga_stride) + (x >> 2); // dest visible (original stride)
-// 	for (i=0;i < h;i++,o += vga_state.vga_draw_stride,o2 += vga_state.vga_stride) vga_wm1_mem_block_copy(o2,o,w >> 2);
-	/* must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally */
-//	vga_restore_rm0wm0();
+	word col = 2, bgcol = 1, type = 1;//w = 64, h = 8,
 	if(elapsed_timer(gv) >= (1.0 / gv->kurokku.frames_per_second))
 	{
         // NTS: For some bizarre reason, gv->pee is not initialized, but the pointer is not NULL even
-        //      though it should be. Instead it's NULL as a near pointer but contains a non-null
+        //      though it should be. Instead it's NULL as a neAr pointer but contains a non-null
         //      segment value, so testing against NULL doesn't work. It is initialized properly if
-        //      you call start_timer() though which uses near malloc. Rather than fight with that,
+        //      you call start_timer() though which uses neAr malloc. Rather than fight with that,
         //      I decided it would be better to declare a temp buffer statically and sprintf to that.
         //
         //      This fixes *** Null pointer assignment detected error message in ZCROLL.EXE on exit.
 		sprintf(global_temp_status_text, "%.0f fps", (double)gv->kurokku.tiku/ticktock(gv));
-		//modexClearRegion(&(gv->video.page[gv->video->sfip]), x, y, w, h, 45);
 		modexprint(&(gv->video.page[/*!*/(gv->video.p)]), x, y, type, col, bgcol, global_temp_status_text);
 		gv->kurokku.tiku=0;
-		/* block copy to visible RAM from offscreen */
-//		vga_setup_wm1_block_copy();
-// 		o =	*(gv->video.page[gv->video->sfip].data); // source offscreen
-// 		o2 =	*(gv->video.page[2].data)+(y * vga_state.vga_stride) + (x >> 2); // dest visible (original stride)
-// 		for (i=0;i < h;i++,o += vga_state.vga_draw_stride,o2 += vga_state.vga_stride) vga_wm1_mem_block_copy(o2,o,w >> 2);
-//		modexCopyPageRegion(&(gv->video.page[gv->video->sfip]), &(gv->video.page[!gv->video->sfip]), x, y, x, 0, w, h);
-		/* must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally */
-//		vga_restore_rm0wm0();
 	}else //copy dat sheet
 	gv->kurokku.tiku++;
 
 	switch(gv->kurokku.fpscap)
 	{
 		case 0:
-			//modexprint(&(gv->video.page[gv->video->sfip]), x, y+8, type, col, bgcol, "sanic!");
+			//modexprint(&(gv->video.page[0]), x, y+8, type, col, bgcol, "sanic!");
 			gv->kurokku.frames_per_second=1;
 		break;
 		case 1:
 			//turn this off if XT
-			//modexWaitBorder();
-			vga_wait_for_vsync();
+			modexWaitBorder_start();
+			//vga_wait_for_vsync();
 			gv->kurokku.frames_per_second=60;
 		break;
 	}
-	if(pageflipflop){
-	if(gv->video.r){
-		//vga_setup_wm1_block_copy();
-		//_fmemcpy((gv->video.page[(gv->video.p)]).data, (gv->video.page[(!gv->video.p)]).data, gv->video.page[(!gv->video.p)].pagesize);
-		//vga_restore_rm0wm0();
-		if(!pageploop) modexCopyPageRegion(&(gv->video.page[(gv->video.p)]), &(gv->video.page[(!gv->video.p)]), 0, 0, 0, 0, gv->video.page[gv->video.p].width, gv->video.page[!gv->video.p].height);
-		modexShowPage(&(gv->video.page[gv->video.p]));
-		if(!pageploop) gv->video.p=!gv->video.p;
-		gv->video.r=!gv->video.r;
+	//render!!
+	if(gv->video.dorender )
+	{//r=1
+		/*if(video->bgp s)
+		{
+			modexCopyPageRegion(&(gv->video.page[ ]), &(gv->video.page[ ]), 0, 0, 0, 0, gv->video.page[ ].width, gv->video.page[ ].height);
+		}else{
+			//modexCopyPageRegion(&video->page[0], &video->page[1], enti->x, enti->y, 0, 0, 24, 32);
+		}*/
+		VL_ShowPage(&(gv->video.page[gv->video.sp]), gv->kurokku.fpscap, 0);
+		gv->video.dorender =!gv->video.dorender ;
 		//0000gv->video.tickclk = ((*clockw)-gv->video.startclk)/18.2;
 	}
-	}
 }
 
-void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch)
+void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn)
 {
-	sword x = player[pn].x;
-	sword y = player[pn].y;
-	sword bx = x+16;	//buffer's x
-	sword by = y+16;	//buffer's y
-	word dire=32; //direction
-	sword qq; //scroll offset
-	word ls = player[pn].persist_aniframe;
-
-	switch(scrollswitch)
+	sword x = player[pn].enti.x;
+	sword y = player[pn].enti.y;
+	sword qq,dd; //scroll offset
+	player[pn].enti.dire=10; //direction
+
+	switch(player[pn].walktype)
 	{
 		case 0:
+			dd = 0;
 			qq = 0;
 		break;
-		default:
-			qq = ((player[pn].q)*(player[pn].speed));
+		case 1:
+			dd = 1;
+			qq = 0;
+		break;
+		case 2:
+			dd = 1;
+			qq = player[pn].enti.q*player[pn].enti.speed;
 		break;
 	}
-	//x-=4;
+	x-=4;
 	y-=pip[0].map->tiles->tileHeight;
-	switch (player[pn].d)
+	switch (player[pn].enti.d)
 	{
 		case 0:
 			//up
-			dire*=player[pn].d;
+			player[pn].enti.dire*=player[pn].enti.d+1;
 			y-=qq;
-			by-=4;
 		break;
 		case 3:
 			// right
-			dire*=(player[pn].d-2);
+			player[pn].enti.dire*=(player[pn].enti.d-1);
 			x+=qq;
-			bx+=4;
 		break;
 		case 2:
 		break;
 		case 4:
 			//down
-			dire*=(player[pn].d-2);
+			player[pn].enti.dire*=(player[pn].enti.d-1);
 			y+=qq;
-			by+=4;
 		break;
 		case 1:
 			//left
-			dire*=(player[pn].d+2);
+			player[pn].enti.dire*=(player[pn].enti.d+3);
 			x-=qq;
-			bx-=4;
 		break;
 	}
-
-#ifdef SPRITE
-#define FRAME1 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 48, dire, 24, 32,	PLAYERBMPDATAPTR);
-#define FRAME2 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, dire, 24, 32,	PLAYERBMPDATAPTR);
-#define FRAME3 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 0, dire, 24, 32,	PLAYERBMPDATAPTR);
-#define FRAME4 modexDrawSpriteRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, dire, 24, 32,	PLAYERBMPDATAPTR);
-#else
-#define FRAME1 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, 2+dire);
-#define FRAME2 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, 1+dire);
-#define FRAME3 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, dire);
-#define FRAME4 modexClearRegion(pip[/*!*/(pip->video->p)].page, x, y, 24, 32, 1+dire);
-#endif
-	if(!pageflipflop)
-		modexCopyPageRegion(pip[1].page, pip[0].page, x-4, y-4, x-4, y-4, 28, 36);
-	else{
-		//copy old bg to page0
-		//modexCopyPageRegion(pip[3].page, pip[0].page, bx, by,	0, 0,	20, 36);
-		//update buffer
-		//modexCopyPageRegion(pip[0].page, pip[3].page, 0, 0,	x, y,	20, 36);
-	}
-//modexCopyPageRegion(page_t *dest, page_t *src, word sx, word sy, word dx, word dy, word width, word height);
-	//modexCopyPageRegion(pip[3].page, pip[!(pip->video->p)].page, x-4, y-4, 0, 128, 28, 36);
-	/*modexCopyPageRegion(pip[pip->video->p].page,
- pip[!(pip->video->p)].page, x-4, y-4, x-4, y-4, 28, 36);*/
-//	else modexCopyPageRegion(pip[1].page, pip[0].page, x-4, y-4, x-4, y-4, 28, 40);
-	switch(ls)
+	player[pn].enti.dire+=dd;
+	if((player[pn].enti.q==1 && player[pn].enti.pred != player[pn].enti.d) || !dd)
 	{
-		case 1:
-			FRAME1
-		break;
-		case 2:
-			FRAME2
-		break;
-		case 3:
-			FRAME3
-		break;
-		case 4:
-			FRAME4
-		break;
+		//0000printf("	q=%u	pred=%u	d=%u	dd=%u\n", player[pn].enti.q, player[pn].enti.pred, player[pn].enti.d, dd);
+		set_anim_by_id(player[pn].enti.spri, player[pn].enti.dire); //pip->video->sprifilei = set_anim_by_id(player[pn].enti.spri, player[pn].enti.dire);	if(pip->video->sprifilei == -1){ printf("ERROR!	%u\n", player[pn].enti.dire); return; }
+		player[pn].enti.pred = player[pn].enti.d;
 	}
-//	if(2>ls && ls>=1) { FRAME1 }else
-//	if(3>ls && ls>=2) { FRAME2 }else
-//	if(4>ls && ls>=3) { FRAME3 }else
-//	if(5>ls && ls>=4) { FRAME4 }
-	//modexCopyPageRegion(pip[0].page, pip[3].page, 0, 0, x, y, 24, 32);
-	//printf("x=%d	y=%d	bx=%d		by=%d\n", x, y, bx, by);
-	pip->video->r=1;
+
+	//setting xy position
+	player[pn].enti.spri->x = x;
+	player[pn].enti.spri->y = y;
+
+	if(pip[0].video->bgps)
+		modexCopyPageRegion(pip[0].page, pip[1].page, x-4, y-4, x-4, y-4, 28, 40);
+	//draw sprite
+	animate_spri(&player[pn].enti, pip[0].video);
+//0000if(player[pn].enti.q<4) delay(200);
+	pip[0].video->dorender = 1;
 }
 
 /*
@@ -1209,12 +815,12 @@ boolean coll_check(int x, int y, int dx, int dy, map_view_t *map_v)
 	return dx && 1;//crossable_tile(x + dx, map_v) || dy && crossable_tile(y + dy, map_v);
 }
 
-boolean ZC_walk2(entity_t *ent, map_view_t *map_v)
+boolean ZC_walk2(entity_t *enti, map_view_t *map_v)
 {
 	//return 1;
 	int dx = 1;
 	int dy = 1;
-	switch(ent->d)
+	switch(enti->d)
 	{
 		case 2:
 			return 0;
@@ -1229,7 +835,7 @@ boolean ZC_walk2(entity_t *ent, map_view_t *map_v)
 			dx = 0;
 			break;
 	}
-	if(coll_check(ent->x, ent->y, dx, dy,  map_v))
+	if(coll_check(enti->x, enti->y, dx, dy,  map_v))
 	{
 		// Allow movement
 		// Set speed
@@ -1243,14 +849,14 @@ boolean ZC_walk2(entity_t *ent, map_view_t *map_v)
 
 void player_walk(player_t *player, map_view_t *map_v){
 	int dx=16, dy=16;
-	if(ZC_walk2(player->ent, map_v) && boundary_check(map_v->tx, map_v->ty, dx, dy, map_v->map->width - 2*map_v->page->tilesw, map_v->map->height - 2*map_v->page->tilesh))
+	if(ZC_walk2(&(player->enti), map_v) && boundary_check(map_v->tx, map_v->ty, dx, dy, map_v->map->width - 2*map_v->page->ti.tilesw, map_v->map->height - 2*map_v->page->ti.tilesh))
 	{
 		mapScroll(map_v, player);
 		// (Un)load stuff?
 	}
 }
 
-void near mapScroll(map_view_t *mv, player_t *player)
+void mapScroll(map_view_t *mv, player_t *player)
 {
 	//word x, y;  /* coordinate for drawing */
 	int c = 1;
@@ -1282,6 +888,4 @@ void near mapScroll(map_view_t *mv, player_t *player)
 		default:
 			break;
 	}
-
-	mv->video->r=1;
 }