X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscroll16.h;h=3c7bc5597e261a20cd4a955f4c71e86792d5c449;hb=402e3d98a783aa08ecbd6f5ff92cdab3c7be7784;hp=8f367bf7b48a14a2fb9f1ff66cbe37da3a55afd4;hpb=62a51803dc18b07a6d1c298220c2aaf553c802e7;p=16.git

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 8f367bf7..3c7bc559 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"
@@ -43,6 +42,10 @@
 #define SPRITE
 //#define TILERENDER
 
+//0000#define SHOWFPS
+//#define OLDWALKSHOWPAGESTUFF
+
+
 #define PLAYERBMPDATAVAR	gvar.player[pn].data
 #define PLAYERBMPDATA		*PLAYERBMPDATAVAR
 #define PLAYERBMPDATAPTR	PLAYERBMPDATAVAR
@@ -77,10 +80,12 @@
 //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))]);\
+	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)+(gvar.map.width*(gvar.player[0].enti.triggery-1))]);\
 	printf("	hp: %d", (gvar.player[0].enti.hp));	printf("	q: %u", gvar.player[0].enti.q);	printf("	info.dir: %u", gvar.player[0].info.dir);	printf("	d: %u", gvar.player[0].enti.d);	printf("	dire: %u", gvar.player[0].enti.dire);\
 		printf("	pdir: %u\n", gvar.player[0].pdir); printf("	delay=%u", gvar.player[0].enti.spri.delay);\
 printf("\n\n");\
@@ -88,35 +93,33 @@ printf("\n\n");\
 \
 	printf("gvar.video:\n");\
 	printf(" r=%u ", gvar.video.dorender);\
-	printf("bgps=%u ", gvar.video.bgps);\
-	printf("dbg_delayanimation=%u ", dbg_delayanimation);\
+	printf("bgps=%u ", gvar.video.vga_state.bgps);\
 printf("\n\n");
 
+//	printf("dbg_delayanimation=%u ", dbg_delayanimation);
 /*
 	if(IN_KeyDown(sc_F11)){ pagedelayrendermap=!pagedelayrendermap;		IN_UserInput(1, &gvar); }
 	if(IN_KeyDown(sc_F10)){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap;		IN_UserInput(1, &gvar); }
 	if(IN_KeyDown(sc_F9)){ pagenorendermap=!pagenorendermap;				IN_UserInput(1, &gvar); }
-	if(IN_KeyDown(sc_F8)){ gvar.video.bgps=!gvar.video.bgps;					IN_UserInput(1, &gvar); }
-	if(IN_KeyDown(sc_T)){ gvar.video.rss=!gvar.video.rss;						IN_UserInput(1, &gvar); }
+	if(IN_KeyDown(sc_F8)){ gvar.video.vga_state.bgps=!gvar.video.vga_state.bgps;					IN_UserInput(1, &gvar); }
+	if(IN_KeyDown(sc_T)){ gvar.video.vga_state.rss=!gvar.video.vga_state.rss;						IN_UserInput(1, &gvar); }
 */
 
-extern boolean pagenorendermap, pagedelayrendermap;
-
 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);
-void ZC_ShowMV(map_view_t *moo, boolean vsync, boolean sr);
+//void ZC_ShowMV(map_view_t *moo, boolean vsync, boolean sr);
 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);
 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);
@@ -129,7 +132,7 @@ void mapDrawWCol(map_view_t *mv, int tx, int ty, word x);
 inline void near ScrollRight(map_view_t *mv, player_t *pl, word id, word plid)
 {
 	/* increment the pixel position and update the page */
-	mv[id].page->dx += pl[plid].enti.speed;
+	mv[id].page->dx += pl[plid].enti.spt;
 
 	/* check to see if this changes the tile */
 	if(mv[id].page->dx >= mv[id].dxThresh )
@@ -146,7 +149,7 @@ inline void near ScrollRight(map_view_t *mv, player_t *pl, word id, word plid)
 inline void near ScrollLeft(map_view_t *mv, player_t *pl, word id, word plid)
 {
 	/* decrement the pixel position and update the page */
-	mv[id].page->dx -= pl[plid].enti.speed;
+	mv[id].page->dx -= pl[plid].enti.spt;
 
 	/* check to see if this changes the tile */
 	if(mv[id].page->dx == 0)
@@ -163,7 +166,7 @@ inline void near ScrollLeft(map_view_t *mv, player_t *pl, word id, word plid)
 inline void near ScrollUp(map_view_t *mv, player_t *pl, word id, word plid)
 {
 	/* decrement the pixel position and update the page */
-	mv[id].page->dy -= pl[plid].enti.speed;
+	mv[id].page->dy -= pl[plid].enti.spt;
 
 	/* check to see if this changes the tile */
 	if(mv[id].page->dy == 0 )
@@ -180,7 +183,7 @@ inline void near ScrollUp(map_view_t *mv, player_t *pl, word id, word plid)
 inline void near ScrollDown(map_view_t *mv, player_t *pl, word id, word plid)
 {
 	/* increment the pixel position and update the page */
-	mv[id].page->dy += pl[plid].enti.speed;
+	mv[id].page->dy += pl[plid].enti.spt;
 
 	/* check to see if this changes the tile */
 	if(mv[id].page->dy >= mv[id].dyThresh )
@@ -206,52 +209,9 @@ boolean ZC_walk2(entity_t *ent, map_view_t *map_v);
 // Move gvar.player around and call map scrolling if required/possible
 void walk_player(player_t *player, map_view_t *map_v);
 
-//check map edge
-inline boolean ZC_mapEdgeChk(map_view_t *map_v, nibble dir, boolean pansw)
-{
-	int	w,h;
-
-	switch (pansw)
-	{
-		case 0:
-			w = map_v[0].map->width;
-			h = map_v[0].map->height;
-		break;
-		case 1:
-			w = map_v[0].page->ti.tilesw;
-			h = map_v[0].page->ti.tilesh;
-		break;
-	}
-
-	switch(dir)
-	{
-		//no direction
-		default:
-		case 2:
-			//0000pip[0].video->startclk = (*clockw);
-			return false;
-		break;
-		//right movement
-		case 3:
-			if(map_v[0].tx >= 0 && map_v[0].tx+map_v[0].page->ti.tw < w) return true;
-		break;
-		//left movement
-		case 1:
-			if(map_v[0].tx > 0 && map_v[0].tx+map_v[0].page->ti.tw <= w) return true;
-		break;
-		//down movement
-		case 4:
-			if(map_v[0].ty >= 0 && map_v[0].ty+map_v[0].page->ti.th < h) return true;
-		break;
-		//up movement
-		case 0:
-			if(map_v[0].ty > 0 && map_v[0].ty+map_v[0].page->ti.th <= h) return true;
-		break;
-	}
-	return false;
-}
-
 // 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_*/