X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscroll16.c;h=0e73d83b99492fb9eec83d1e8c5d7c8801fa6d82;hb=05646f1436736a76ebeec2796f3244c70ed7a92f;hp=9a4708abedfe2daf0e7ec74287c36db2849cd680;hpb=2f1cfb3766a0b1d5e707cc93488dbf276ed48a3e;p=16.git

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 9a4708ab..0e73d83b 100755
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -36,8 +36,8 @@ 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->ti.tw < pip[0].map->width && player[pn].enti.tx == pip[0].tx+pip[0].page->ti.tilemidposscreenx &&
-			!(pip[0].map->MAPDATAPTR[(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(ZC_mapEdgeChk(pip, player[pn].enti.d, 0) && player[pn].enti.tx == pip[0].tx+pip[0].page->ti.tilemidposscreenx &&
+			!(pip[0].map->layerdata[0].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!
 			{
 				player[pn].walktype=2;
 				if(player[pn].enti.q<=player[pn].enti.spt)
@@ -48,7 +48,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
 					//0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;
 				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx++; }
 			}
-			else if(player[pn].enti.tx < pip[0].map->width && !(pip[0].map->MAPDATAPTR[(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))
+			else if(player[pn].enti.tx < pip[0].map->width && !(pip[0].map->layerdata[0].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))
 			{
 				player[pn].walktype=1;
 				if(player[pn].enti.q<=player[pn].enti.spt)
@@ -69,8 +69,8 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
 		break;
 		//left movement
 		case 1:
-			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->MAPDATAPTR[(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(ZC_mapEdgeChk(pip, player[pn].enti.d, 0) && player[pn].enti.tx == pip[0].tx+pip[0].page->ti.tilemidposscreenx &&
+			!(pip[0].map->layerdata[0].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!
 			{
 				player[pn].walktype=2;
 				if(player[pn].enti.q<=player[pn].enti.spt)
@@ -81,7 +81,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
 					//0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;
 				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.tx--; }
 			}
-			else if(player[pn].enti.tx > 1 && !(pip[0].map->MAPDATAPTR[(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))
+			else if(player[pn].enti.tx > 1 && !(pip[0].map->layerdata[0].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))
 			{
 				player[pn].walktype=1;
 				if(player[pn].enti.q<=player[pn].enti.spt)
@@ -102,8 +102,8 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
 		break;
 		//down movement
 		case 4:
-			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->MAPDATAPTR[(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(ZC_mapEdgeChk(pip, player[pn].enti.d, 0) && player[pn].enti.ty == pip[0].ty+pip[0].page->ti.tilemidposscreeny &&
+			!(pip[0].map->layerdata[0].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!
 			{
 				player[pn].walktype=2;
 				if(player[pn].enti.q<=player[pn].enti.spt)
@@ -114,7 +114,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
 					//0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;
 				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty++; }
 			}
-			else if(player[pn].enti.ty < pip[0].map->height && !(pip[0].map->MAPDATAPTR[(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))
+			else if(player[pn].enti.ty < pip[0].map->height && !(pip[0].map->layerdata[0].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))
 			{
 				player[pn].walktype=1;
 				if(player[pn].enti.q<=player[pn].enti.spt)
@@ -135,8 +135,8 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
 		break;
 		//up movement
 		case 0:
-			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->MAPDATAPTR[(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(ZC_mapEdgeChk(pip, player[pn].enti.d, 0) && player[pn].enti.ty == pip[0].ty+pip[0].page->ti.tilemidposscreeny &&
+			!(pip[0].map->layerdata[0].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!
 			{
 				player[pn].walktype=2;
 				if(player[pn].enti.q<=player[pn].enti.spt)
@@ -147,7 +147,7 @@ void ZC_walk(map_view_t *pip, player_t *player, word pn)
 					//0000pip[0].video->clk = ((*clockw)-pip[0].video->startclk)/18.2;
 				} else { player[pn].enti.q = 1; player[pn].enti.d = 2; player[pn].enti.ty--; }
 			}
-			else if(player[pn].enti.ty > 1 && !(pip[0].map->MAPDATAPTR[(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))
+			else if(player[pn].enti.ty > 1 && !(pip[0].map->layerdata[0].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))
 			{
 				player[pn].walktype=1;
 				if(player[pn].enti.q<=player[pn].enti.spt)
@@ -178,7 +178,7 @@ void ZC_panPageManual(map_view_t *pip, player_t *player, word pn)
 	{
 		//right movement
 		case 3:
-			if(pip[0].tx >= 0 && pip[0].tx+pip[0].page->ti.tw < pip[0].page->ti.tilesw)
+			if(ZC_mapEdgeChk(pip, player[pn].enti.d, 1))
 			{
 				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
@@ -191,7 +191,7 @@ void ZC_panPageManual(map_view_t *pip, player_t *player, word pn)
 
 		//left movement
 		case 1:
-			if(pip[0].tx > 0 && pip[0].tx+pip[0].page->ti.tw <= pip[0].page->ti.tilesw)
+			if(ZC_mapEdgeChk(pip, player[pn].enti.d, 1))
 			{
 				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
@@ -204,7 +204,7 @@ void ZC_panPageManual(map_view_t *pip, player_t *player, word pn)
 
 		//down movement
 		case 4:
-			if(pip[0].ty >= 0 && pip[0].ty+pip[0].page->ti.th < pip[0].page->ti.tilesh)
+			if(ZC_mapEdgeChk(pip, player[pn].enti.d, 1))
 			{
 				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
@@ -217,7 +217,7 @@ void ZC_panPageManual(map_view_t *pip, player_t *player, word pn)
 
 		//up movement
 		case 0:
-			if(pip[0].ty > 0 && pip[0].ty+pip[0].page->ti.th <= pip[0].page->ti.tilesh)
+			if(ZC_mapEdgeChk(pip, player[pn].enti.d, 1))
 			{
 				if(player[pn].enti.q<=player[pn].enti.spt)
 				{
@@ -318,8 +318,8 @@ initMap(map_t *map) {
 	i=0;
 	for(y=0; y<map->height; y++) {
 		for(x=0; x<map->width; x++) {
-			map->MAPDATAPTR[i]=255;
-//			printf("[%d]", map->MAPDATAPTR[i]);
+			map->layerdata[0].data[i]=255;
+//			printf("[%d]", map->layerdata[0].data[i]);
 			tile = tile ? 0 : 1;
 			i++;
 		}
@@ -337,7 +337,8 @@ void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid)
 	ScrollRight(mv, player, id, plid);
 
 	/* draw the next column */
-	x= mv[0].page->sw + mv[0].map->MAPTILESPTR->tileWidth;
+	x= mv[0].page->sw + mv[0].map->tiles->tileWidth;
+	if(ZC_mapEdgeChk(mv, player[plid].enti.d, 0))
 #ifndef FULLRCREND
 	if(player[plid].enti.q%4)
 #else
@@ -347,7 +348,7 @@ void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid)
 			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->MAPTILESPTR->tileWidth, mv[0].page->height);
+//				modexCopyPageRegion(mv->page, mv[0].page, x, 0, x, 0, mv[0].map->tiles->tileWidth, mv[0].page->height);
 	//mv[0].video->dorender=1;//ScrollRight
 }
 
@@ -360,6 +361,7 @@ void near mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid)
 
 	/* draw the next column */
 	x= 0;
+	if(ZC_mapEdgeChk(mv, player[plid].enti.d, 0))
 #ifndef FULLRCREND
 	if(player[plid].enti.q%4)
 #else
@@ -369,7 +371,7 @@ void near mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid)
 			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->MAPTILESPTR->tileWidth, mv[0].page->height);
+//				modexCopyPageRegion(mv->page, mv[0].page, x, 0, x, 0, mv[0].map->tiles->tileWidth, mv[0].page->height);
 	//mv[0].video->dorender=1;//ScrollLeft
 }
 
@@ -382,6 +384,7 @@ void near mapScrollUp(map_view_t *mv, player_t *player, word id, word plid)
 
 	/* draw the next row */
 	y= 0;
+	if(ZC_mapEdgeChk(mv, player[plid].enti.d, 0))
 #ifndef FULLRCREND
 	if(player[plid].enti.q%3)
 #else
@@ -391,7 +394,7 @@ void near mapScrollUp(map_view_t *mv, player_t *player, word id, word plid)
 			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->MAPTILESPTR->tileHeight);
+//				modexCopyPageRegion(mv->page, mv[0].page, 0, y, 0, y, mv[0].page->width, mv[0].map->tiles->tileHeight);
 	//mv[0].video->dorender=1;//ScrollUp
 }
 
@@ -403,7 +406,8 @@ void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid)
 	ScrollDown(mv, player, id, plid);
 
 	/* draw the next row */
-	y= mv[0].page->sh + mv[0].map->MAPTILESPTR->tileHeight;
+	y= mv[0].page->sh + mv[0].map->tiles->tileHeight;
+	if(ZC_mapEdgeChk(mv, player[plid].enti.d, 0))
 #ifndef FULLRCREND
 	if(player[plid].enti.q%3)
 #else
@@ -413,7 +417,7 @@ void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid)
 			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->MAPTILESPTR->tileHeight);
+//				modexCopyPageRegion(mv->page, mv[0].page, 0, y, 0, y, mv[0].page->width, mv[0].map->tiles->tileHeight);
 	//mv[0].video->dorender=1;//ScrollDown
 }
 
@@ -455,7 +459,7 @@ 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, nibble pn, boolean defaultsw)
 {
 	player[pn].enti.tx = x + pip[0].tx;
 	player[pn].enti.ty = y + pip[0].ty;
@@ -498,16 +502,16 @@ sword chkmap(map_t *map, word q)
 		//initiate a null map!
 		map->width=MAPW;///2;
 		map->height=MAPH;///2;
-//		map->MAPDATAPTR = malloc(((map->width*map->height)+1)*sizeof(byte));
-		map->MAPDATAPTR = &x;
-		map->MAPTILESPTR = malloc(sizeof(tiles_t));
+//		map->layerdata[0].data = fmfaflflfofcf(((map->width*map->height)+1)*sizeof(byte));
+		map->layerdata[0].data = &x;
+		//map->tiles = fmfafflflfofc(sizeof(tiles_t));
 		//fix this to be far~
 //		bp = bitmapLoadPcx("data/ed.pcx");
-//		map->MAPTILESPTR->data = &bp;
-		map->MAPTILESPTR->tileHeight = 16;
-		map->MAPTILESPTR->tileWidth = 16;
-		map->MAPTILESPTR->rows = 1;
-		map->MAPTILESPTR->cols = 1;
+//		map->tiles->data = &bp;
+		map->tiles->tileHeight = 16;
+		map->tiles->tileWidth = 16;
+		map->tiles->rows = 1;
+		map->tiles->cols = 1;
 #ifdef __DEBUG_MAP__
 		dbg_maptext = true;
 #endif
@@ -538,12 +542,12 @@ void ZC_mapinitMV(map_view_t *mv, int tx, int ty)
 	/* set up the coordinates */
 	mv[0].tx = mv[1].tx = tx;
 	mv[0].ty = mv[1].ty = ty;
-	mv[0].page->dx = mv[1].page->dx = mv[2].page->dx = mv[3].page->dx = mv->map->MAPTILESPTR->tileWidth;
-	mv[0].page->dy = mv[1].page->dy = mv[2].page->dy = mv[3].page->dy = mv->map->MAPTILESPTR->tileHeight;
+	mv[0].page->dx = mv[1].page->dx = mv[2].page->dx = mv[3].page->dx = mv->map->tiles->tileWidth;
+	mv[0].page->dy = mv[1].page->dy = mv[2].page->dy = mv[3].page->dy = mv->map->tiles->tileHeight;
 
 	/* set up the thresholds */
-	mv[0].dxThresh = mv[1].dxThresh = mv[2].dxThresh = mv[3].dxThresh = mv->map->MAPTILESPTR->tileWidth * 2;
-	mv[0].dyThresh = mv[1].dyThresh = mv[2].dyThresh = mv[3].dyThresh = mv->map->MAPTILESPTR->tileHeight * 2;
+	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].dyThresh = mv[3].dyThresh = mv->map->tiles->tileHeight * 2;
 }
 
 void ZC_mapredraw(map_view_t *mv, int tx, int ty)
@@ -553,7 +557,7 @@ void ZC_mapredraw(map_view_t *mv, int tx, int ty)
 
 	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->MAPTILESPTR->tileHeight) {
+	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;
@@ -563,106 +567,114 @@ void ZC_mapredraw(map_view_t *mv, int tx, int ty)
 void near
 mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
 {
-	word rx;
-	word ry;
-	//word textx=0, texty=0;
-	//if(i==0) i=2;
-	if(i==0)
+	word rx, ry;
+//	printf("%02d ", i); if(x >= page->width - t->tileWidth) printf("\n");
+	switch(i)
 	{
-		//wwww
-		modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, 1); //currently the over scan color!
-	}
-	else
-	{
-		rx = (((i-1) % ((t->data->width)/t->tileWidth)) * t->tileWidth);
-		ry = (((i-1) / ((t->data->height)/t->tileHeight)) * t->tileHeight);
-////0000printf("i=%d\n", i);
-#ifdef __DEBUG_MAP__
-		switch(dbg_maptext)
-		{
-			case 0:
-#endif
+		case 0:
+			//wwww
+			modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, 1); //currently the over scan color!
+		break;
+		default:
+			rx = (((i-1) % ((t->spri->sprite_vrl_cont.vrl_header->width)/t->tileWidth)) * t->tileWidth);
+			ry = (((i-1) / ((t->spri->sprite_vrl_cont.vrl_header->height)/t->tileHeight)) * t->tileHeight);
 #ifndef TILERENDER
-				if(!pagenorendermap) modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, i+1);
+			if(!pagenorendermap) modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, i+1);
 #else
-				modexDrawBmpRegion		(page, x, y, rx, ry, t->tileWidth, t->tileHeight, i);
-				/* then the sprite. note modding ram ptr means we just draw to (x&3,0) */
-				//draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));
-				//modexDrawBmpRegion	(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data));
+			modexDrawBmpRegion		(page, x, y, rx, ry, t->tileWidth, t->tileHeight, i);
+			//draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));
+			//modexDrawBmpRegion	(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data));
 #endif
 #ifdef __DEBUG_MAP__
-			break;
-			case 1:
-				if(!pagenorendermap) modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, i);
-				sprintf(global_temp_status_text2, "%d", i);
-				modexprint(page, x, y, 1, 1, 2, global_temp_status_text2);
-			break;
-		}
+			if(dbg_maptext){ sprintf(global_temp_status_text2, "%u", i); modexprint(page, x, y, 1, 0, 1, 2, global_temp_status_text2); }
 #endif
+		break;
 	}
 }
-
+#define PALMAPDRAWW 13
 void near mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *player, word poopoffset)
 {
-	int i;
+	int i; nibble z;
 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); }
+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, 0, PALMAPDRAWW, 1, global_temp_status_text); }
 	/* the position within the map array */
 	i=ty * mv->map->width + tx;
-	for(	mv->dx=poopoffset;	mv->dx<(mv->page->sw+mv->dxThresh)/(poopoffset+1) && tx < mv->map->width;	mv->dx+=mv->map->MAPTILESPTR->tileWidth, tx++) {
-		if(i>=0)
-			mapDrawTile(mv->map->MAPTILESPTR, mv->map->MAPDATAPTR[i], mv->page, mv->dx, y);
+	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){
+			mapDrawTile(mv->map->tiles, mv->map->layerdata[0].data[i], mv->page, mv->dx, y);
+			for(z=1;z<=2;z++)
+				if(mv->map->layerdata[z].data[i]){
+					sprintf(global_temp_status_text2, "%u", mv->map->layerdata[z].data[i]); modexprint(mv->page, mv->dx, y, 1, 0, PALMAPDRAWW, z+2, global_temp_status_text2);
+					//mapDrawTile(mv->map->tiles, mv->map->layerdata[z].data[i], mv->page, mv->dx, y);
+				}
+		}
 		i++; /* next! */
-	}
-if(pagedelayrendermap) delay(200);
+	} if(pagedelayrendermap) delay(200);
 }
 
 void near mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *player, word poopoffset)
 {
-	int i;
+	int i; nibble z;
 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); }
+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, 0, PALMAPDRAWW, 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(	mv->dy=poopoffset;	mv->dy<(mv->page->sh+mv->dyThresh)/(poopoffset+1) && ty < mv->map->height;	mv->dy+=mv->map->MAPTILESPTR->tileHeight, ty++) {
-		if(i>=0)
-			mapDrawTile(mv->map->MAPTILESPTR, mv->map->MAPDATAPTR[i], mv->page, x, mv->dy);
+	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){
+			mapDrawTile(mv->map->tiles, mv->map->layerdata[0].data[i], mv->page, x, mv->dy);
+			for(z=1;z<=2;z++)
+				if(mv->map->layerdata[z].data[i]){
+					sprintf(global_temp_status_text2, "%u", mv->map->layerdata[z].data[i]); modexprint(mv->page, x, mv->dy, 1, 0, PALMAPDRAWW, z+2, global_temp_status_text2);
+					//mapDrawTile(mv->map->tiles, mv->map->layerdata[z].data[i], mv->page, x, mv->dy);
+				}
+		}
 		i += mv->map->width;
-	}
-if(pagedelayrendermap) delay(200);
+	} if(pagedelayrendermap) delay(200);
 }
 
 void mapDrawWRow(map_view_t *mv, int tx, int ty, word y)
 {
-	int i;
+	int i; nibble z;
 
 	/* the position within the map array */
 	i=ty * mv->map->width + tx;
-	for(mv->dx=0; mv->dx<mv->page->sw+mv->dxThresh && tx < mv->map->width; mv->dx+=mv->map->MAPTILESPTR->tileWidth, tx++) {
-		if(i>=0)	/* we are in the map, so copy! */
-			mapDrawTile(mv->map->MAPTILESPTR, mv->map->MAPDATAPTR[i], mv->page, mv->dx, y);
+	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->layerdata[0].data[i], mv->page, mv->dx, y);
+			for(z=1;z<=2;z++)
+				if(mv->map->layerdata[z].data[i]){
+					sprintf(global_temp_status_text2, "%u", mv->map->layerdata[z].data[i]); modexprint(mv->page, mv->dx, y, 1, 0, PALMAPDRAWW, z+2, global_temp_status_text2);
+					//mapDrawTile(mv->map->tiles, mv->map->layerdata[z].data[i], mv->page, mv->dx, y);
+				}
+		}
 		i++; /* next! */
 	}
 }
 
 void mapDrawWCol(map_view_t *mv, int tx, int ty, word x)
 {
-	int i;
+	int i; nibble z;
 
 	/* 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(mv->dy=0; mv->dy<mv->page->sh+mv->dyThresh && ty < mv->map->height; mv->dy+=mv->map->MAPTILESPTR->tileHeight, ty++) {
-		if(i>=0)	/* we are in the map, so copy away! */
-			mapDrawTile(mv->map->MAPTILESPTR, mv->map->MAPDATAPTR[i], mv->page, x, mv->dy);
+	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->layerdata[0].data[i], mv->page, x, mv->dy);
+			for(z=1;z<=2;z++)
+				if(mv->map->layerdata[z].data[i]){
+					sprintf(global_temp_status_text2, "%u", mv->map->layerdata[z].data[i]); modexprint(mv->page, x, mv->dy, 1, 0, PALMAPDRAWW, z+2, global_temp_status_text2);
+					//mapDrawTile(mv->map->tiles, mv->map->layerdata[z].data[i], mv->page, x, mv->dy);
+				}
+		}
 		i += mv->map->width;
 	}
 }
@@ -681,20 +693,23 @@ void shinku(global_game_variables_t *gv)
         // 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
         //      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));
-		//modexprint(&(gv->video.page[/*!*/(gv->video.p)]), x, y, type, col, bgcol, global_temp_status_text);
-		modexCopyPageRegion(&gv->video.page[0], &gv->video.page[1],
-			gv->video.page[/*!*/(gv->video.p)].dx,
-			gv->video.page[/*!*/(gv->video.p)].dy,
-			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, col, bgcol, global_temp_status_text);
+		//modexprint(&(gv->video.page[/*!*/(gv->video.p)]), x, y, type, 1, col, bgcol, global_temp_status_text);
+		if(gv->kurokku.wcpu)
+		{
+			modexCopyPageRegion(&gv->video.page[0], &gv->video.page[1],
+				gv->video.page[/*!*/(gv->video.p)].dx,
+				gv->video.page[/*!*/(gv->video.p)].dy,
+				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, bgcol, global_temp_status_text);
 //0000printf("dx=%u	dy=%u\n", gv->video.page[/*!*/(gv->video.p)].dx, gv->video.page[/*!*/(gv->video.p)].dy);
+		}
 		gv->kurokku.tiku=0;
 	}else //copy dat sheet
 	gv->kurokku.tiku++;
@@ -702,7 +717,7 @@ void shinku(global_game_variables_t *gv)
 	switch(gv->kurokku.fpscap)
 	{
 		case 0: //turn this off if XT
-			//modexprint(&(gv->video.page[0]), x, y+8, type, col, bgcol, "sanic!");
+			//modexprint(&(gv->video.page[0]), x, y+8, type, 1, col, bgcol, "sanic!");
 			gv->kurokku.frames_per_second=1;
 		break;
 		case 1:
@@ -726,6 +741,7 @@ void shinku(global_game_variables_t *gv)
 		gv->video.dorender =!gv->video.dorender ;
 		//0000gv->video.tickclk = ((*clockw)-gv->video.startclk)/18.2;
 	}
+	PM_NextFrame(gv);
 }
 
 void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn)
@@ -751,7 +767,7 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn)
 		break;
 	}
 	x-=4;
-	y-=pip[0].map->MAPTILESPTR->tileHeight;
+	y-=pip[0].map->tiles->tileHeight;
 	switch (player[pn].enti.d)
 	{
 		case 0:
@@ -779,13 +795,13 @@ void near ZC_animatePlayer(map_view_t *pip, player_t *player, word pn)
 	}
 	player[pn].enti.dire+=dd;
 	//setting xy position
-	player[pn].enti.spri->x = x;
-	player[pn].enti.spri->y = y;
+	player[pn].enti.spri.x = x;
+	player[pn].enti.spri.y = y;
 
 	if((player[pn].enti.q==1 && player[pn].enti.pred != player[pn].enti.d) || !dd)//when dir changed OR when player change face direction
 	{
 		//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; }
+		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(!dd)//changed direction while NOT moving!
 		{
@@ -860,6 +876,10 @@ void player_walk(player_t *player, map_view_t *map_v){
 	}
 }
 
+/*
+ *	end
+ */
+
 void mapScroll(map_view_t *mv, player_t *player)
 {
 	//word x, y;  /* coordinate for drawing */