X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscroll16.h;h=fc187954663f4a3fbfdf0d8fe805146f437dfde7;hb=40e0a339b2d6e79ace05d43dd9d44b21b23244b1;hp=3d9fe4c01f0c2fa5936e667f9152411e8a8144c1;hpb=ffbad4972c8eed182edd7c0ba1fef0bc1d457bf2;p=16.git

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 3d9fe4c0..fc187954 100755
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -72,15 +72,16 @@
 //not used now	printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");
 //printf("mv[%u].tx: %d", gvar.video.panp, mv[gvar.video.panp].tx); printf("	mv[%u].ty: %d	", gvar.video.panp, mv[gvar.video.panp].ty);
 //printf("gvar.kurokku:	"); printf("%.0f ", clock());	printf("tiku=%lu ", gvar.kurokku.tiku);	printf("t=%.0f ", gvar.kurokku.t);	printf("ticktock()=%f ", ticktock(&gvar));	printf("%.0f fps", (double)gvar.kurokku.tiku/ticktock(&gvar));
-//printf("map.width=%d	map.height=%d	map.data[0]=%d\n", mv[1].map->width, mv[1].map->height, mv[1].map->data[0]);
+//printf("map.width=%d	map.height=%d	map.data[0]=%d\n", mv[1].map->width, mv[1].map->height, mv[1].map->layerdata[0][0]);
 //printf("pageflipflop=%u", pageflipflop);
 //printf("&global_temp_status_text = %Fp\n", &global_temp_status_text);
 //printf("middle tile position: %dx", gvar.video.page[0].tilemidposscreenx);	printf("%d\n", gvar.video.page[0].tilemidposscreeny);
 //printf("	aniframe=%u", player[0].enti.persist_aniframe);
-#define SCROLLEXITMESG 	printf("[0]txy: %dx%d	", mv[0].tx, mv[0].ty); printf("[1]txy: %dx%d", mv[1].tx, mv[1].ty);\
+//printf("mv[0]txy: %dx%d	", mv[0].tx, mv[0].ty); printf("mv[1]txy: %dx%d", mv[1].tx, mv[1].ty);
+#define SCROLLEXITMESG 	printf("page[0]dxy: %dx%d", gvar.video.page[0].dx, gvar.video.page[0].dy);\
 	printf("\n\n");\
 	printf("player vars:\n");\
-	printf("	xy: %dx%d", player[0].enti.x, player[0].enti.y); printf("	txy: %dx%d", player[0].enti.tx, player[0].enti.ty); printf("	triggxy: %dx%d", player[0].enti.triggerx, player[0].enti.triggery); printf("	value: %d\n", mv[1].map->data[(player[0].enti.triggerx-1)+(map.width*(player[0].enti.triggery-1))]);\
+	printf("	xy: %dx%d", player[0].enti.x, player[0].enti.y); printf("	txy: %dx%d", player[0].enti.tx, player[0].enti.ty); printf("	triggxy: %dx%d", player[0].enti.triggerx, player[0].enti.triggery); printf("	value: %d\n", mv[1].map->MAPDATAPTR[(player[0].enti.triggerx-1)+(map.width*(player[0].enti.triggery-1))]);\
 	printf("	hp: %d", (player[0].enti.hp));	printf("	q: %u", player[0].enti.q);	printf("	info.dir: %u", player[0].info.dir);	printf("	d: %u", player[0].enti.d);	printf("	dire: %u", player[0].enti.dire);\
 		printf("	pdir: %u\n", player[0].pdir); printf("	delay=%u", player[0].enti.spri->delay);\
 printf("\n\n");\
@@ -94,6 +95,7 @@ printf("\n\n");
 extern boolean pagenorendermap, pagedelayrendermap;
 
 extern char global_temp_status_text[512];
+extern char global_temp_status_text2[512];
 
 //map_t allocMap(int w, int h);
 void initMap(map_t *map);
@@ -130,7 +132,7 @@ inline void near ScrollRight(map_view_t *mv, player_t *player, word id, word pli
 		/* Snap the origin forward */
 		mv[id].page->data += 4;
 
-		mv[id].page->dx = mv[id].map->tiles->tileWidth;
+		mv[id].page->dx = mv[id].map->MAPTILESPTR->tileWidth;
 	}
 }
 
@@ -147,7 +149,7 @@ inline void near ScrollLeft(map_view_t *mv, player_t *player, word id, word plid
 		/* Snap the origin backward */
 		mv[id].page->data -= 4;
 
-		mv[id].page->dx = mv[id].map->tiles->tileWidth;
+		mv[id].page->dx = mv[id].map->MAPTILESPTR->tileWidth;
 	}
 }
 
@@ -164,7 +166,7 @@ inline void near ScrollUp(map_view_t *mv, player_t *player, word id, word plid)
 		/* Snap the origin upward */
 		mv[id].page->data -= mv[id].page->pi;
 
-		mv[id].page->dy = mv[id].map->tiles->tileHeight;
+		mv[id].page->dy = mv[id].map->MAPTILESPTR->tileHeight;
 	}
 }
 
@@ -181,7 +183,7 @@ inline void near ScrollDown(map_view_t *mv, player_t *player, word id, word plid
 		/* Snap the origin downward */
 		mv[id].page->data += mv[id].page->pi;
 
-		mv[id].page->dy = mv[id].map->tiles->tileHeight;
+		mv[id].page->dy = mv[id].map->MAPTILESPTR->tileHeight;
 	}
 }