X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscroll16.h;h=8d79d213bb02579773fa97d831ae47933914b2e1;hb=1159fe5a6cd0f8eaeee6e8584f5972d42e004073;hp=4f1b539fca5bc1d2751728ecb79ef9131e87c979;hpb=825e44f7e2255268fedd03109c29a35ff1243c16;p=16.git

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 4f1b539f..8d79d213 100755
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -24,16 +24,16 @@
 #define __SCROLL16_H_
 
 #include "src/lib/16_head.h"
+#include "src/lib/16_tail.h"
 #include "src/lib/bakapee.h"
 #include "src/lib/16_vl.h"
 #include "src/lib/16_in.h"
 #include "src/lib/bitmap.h"
-#include "src/lib/mapread.h" //map is loaded here www
+#include "src/lib/16_map.h" //map is loaded here www
 #include "src/lib/16render.h"
 //#include "src/lib/16_map.h"	//new map stuff
 #include "src/lib/16_timer.h"
-#include "src/lib/wcpu/wcpu.h"
-#include "src/lib/16_tail.h"
+#include "src/lib/wcpu/16_wcpu.h"
 
 #include <hw/cpu/cpu.h>
 #include <hw/dos/dos.h>
@@ -75,15 +75,44 @@ typedef struct {
  * 	should have a sprite too. Map is drawn left-to-right, top-to-bottom.
  */
 
-typedef struct
-{
-	map_view_t *mv;
-} map_view_db_t;
-
 //for null map!
 #define MAPW	40
 #define MAPH	30
 
+	//if(player[0].hp==0) printf("%d wwww\n", player[0].y+8);
+	//else printf("\nplayer[0].y: %d\n", player[0].y);
+//	printf("palette offset:	%d\n", paloffset/3);
+//++++	printf("Total used: %zu\n", oldfreemem-GetFreeSize());
+//++++	printf("Total free: %zu\n", GetFreeSize());
+//not used now	printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n");
+//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", pan.pn, mv[pan.pn].tx); printf("	mv[%u].ty: %d	", pan.pn, mv[pan.pn].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[0].map->width, mv[0].map->height, mv[0].map->data[0]);
+//printf("&global_temp_status_text = %Fp\n", &global_temp_status_text);
+#define SCROLLEXITMESG 	printf("tx: %d	", mv[0].tx);\
+	printf("ty: %d\n", mv[0].ty);\
+	printf("\n");\
+	printf("player vars:\n");\
+	printf("	x: %d", player[0].x); printf("	y: %d\n", player[0].y);\
+	\
+	printf("	tx: %d", player[0].tx); printf("	ty: %d\n", player[0].ty);\
+	printf("	triggx: %d", player[0].triggerx); printf("	triggy: %d\n", player[0].triggery);\
+	printf("	hp: %d", (player[0].hp));	printf("	q: %d", player[0].q);	printf("	player.info.dir: %d", player[0].info.dir);	printf("	player.d: %d ", player[0].d);\
+		printf("	pdir=%d\n", player[0].pdir);\
+	printf("	tile data value at player trigger position: %d\n\n", mv[0].map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))]);\
+\
+	printf("Virtual Screen: %dx", gvar.video.page[0].width);	printf("%d	", gvar.video.page[0].height);\
+	printf("Screen: %dx", gvar.video.page[0].sw);	printf("%d\n", gvar.video.page[0].sh);\
+	printf("virtual tile resolution: %dx", gvar.video.page[0].tilesw);	printf("%d	", gvar.video.page[0].tilesh);\
+	printf("tile resolution: %dx", gvar.video.page[0].tw);	printf("%d\n", gvar.video.page[0].th);\
+	printf("middle tile position: %dx", gvar.video.page[0].tilemidposscreenx);	printf("%d\n", gvar.video.page[0].tilemidposscreeny);\
+	modexprintmeminfo(&gvar.video);\
+\
+	printf("gvar.video.p=%u ", gvar.video.p); printf("gvar.video.r=%u ", gvar.video.r);\
+	printf("pageflipflop=%u\n", pageflipflop);\
+	printf("\n");
+
 extern boolean pageflipflop, pageploop;
 extern unsigned char shinku_fps_indicator_page;
 
@@ -92,7 +121,9 @@ extern char global_temp_status_text[512];
 //map_t allocMap(int w, int h);
 //void initMap(map_t *map);
 void walk(map_view_t *pip, player_t *player, word pn);
-void panpagemanual(map_view_t *pip,  player_t *player, word pn);
+void panPageManual(map_view_t *pip,  player_t *player, word pn);
+void panVmemManual(map_view_t *pip, player_t *player, word pn);
+void modexMVSetup(map_view_t *mv, map_t *map, pan_t *pan, global_game_variables_t *gv);
 void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid);
 void near mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid);
 void near mapScrollUp(map_view_t *mv, player_t *player, word id, word plid);
@@ -103,6 +134,7 @@ void near ScrollUp(map_view_t *mv, player_t *player, word id, word plid);
 void near ScrollDown(map_view_t *mv, player_t *player, word id, word plid);
 sword chkmap(map_t *map, word q);
 void mapGoTo(map_view_t *mv, int tx, int ty);
+void mapinitmapview(map_view_t *mv, int tx, int ty);
 void near 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 mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *p, word poopoffset);