X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscroll16.h;h=20836e3da5cdaa3ade4b483a08b99b15f4428110;hb=1522130c288695fd2ad573be62b7bfc300eed6a3;hp=2eb1b8383f953538624f704d154611c62979d1d1;hpb=243e22dc4fb6ae069348ac984f79ae7827747be1;p=16.git

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 2eb1b838..20836e3d 100755
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -29,8 +29,7 @@
 #include "src/lib/16_vl.h"
 #include "src/lib/16_in.h"
 #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/16render.h"
 #include "src/lib/16_timer.h"
 #include "src/lib/wcpu/16_wcpu.h"
 #include "src/lib/16_spri.h"
@@ -42,9 +41,12 @@
 
 #define SPRITE
 //#define TILERENDER
+
+//0000
 #define SHOWFPS
 //#define OLDWALKSHOWPAGESTUFF
 
+
 #define PLAYERBMPDATAVAR	gvar.player[pn].data
 #define PLAYERBMPDATA		*PLAYERBMPDATAVAR
 #define PLAYERBMPDATAPTR	PLAYERBMPDATAVAR
@@ -79,7 +81,9 @@
 //printf("middle tile position: %dx", gvar.video.page[0].tilemidposscreenx);	printf("%d\n", gvar.video.page[0].tilemidposscreeny);
 //printf("	aniframe=%u", gvar.player[0].enti.persist_aniframe);
 //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("page[0]dxy: %dx%d", gvar.video.page[0].dx, gvar.video.page[0].dy);
+#define SCROLLEXITMESG \
+	printf("size of mmblocktype: %u	", sizeof(mmblocktype));\
 	printf("\n\n");\
 	printf("player vars:\n");\
 	printf("	xy: %dx%d", gvar.player[0].enti.x, gvar.player[0].enti.y); printf("	txy: %dx%d", gvar.player[0].enti.tx, gvar.player[0].enti.ty); printf("	triggxy: %dx%d", gvar.player[0].enti.triggerx, gvar.player[0].enti.triggery); printf("	value: %d\n", gvar.mv[1].map->layerdata[0].data[(gvar.player[0].enti.triggerx-1)+(map.width*(gvar.player[0].enti.triggery-1))]);\
@@ -106,7 +110,7 @@ extern char global_temp_status_text[512];
 extern char global_temp_status_text2[512];
 
 void initMap(map_t *map);
-void ZC_walk(map_view_t *pip, player_t *player, word pn);
+void ZC_walk(global_game_variables_t *gvar, word pn);
 void ZC_panPageManual(map_view_t *pip, player_t *player, word pn);
 void ZC_MVSetup(map_view_t *pip, map_t *map, global_game_variables_t *gv);
 void ZC_MVInit(map_view_t *pip, int tx, int ty);
@@ -116,7 +120,7 @@ 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);
 void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid);
 void ZC_mapScroll(map_view_t *mv, player_t *player, word pn);
-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);
 sword chkmap(map_t *map, word q);
 void mapGoTo(map_view_t *mv, int tx, int ty);
 void ZC_mapinitMV(map_view_t *mv, int tx, int ty);
@@ -209,4 +213,6 @@ void walk_player(player_t *player, map_view_t *map_v);
 // Scroll map in one direction (assumed from gvar.player's movement)
 void mapScroll(map_view_t *mv, player_t *player);
 
+void ZC_GirdChk (global_game_variables_t *gvar, player_t *player);
+
 #endif /*__SCROLL16_H_*/