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

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 8f367bf7..784e7cf7 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,6 +41,8 @@
 
 #define SPRITE
 //#define TILERENDER
+//0000#define SHOWFPS
+//#define OLDWALKSHOWPAGESTUFF
 
 #define PLAYERBMPDATAVAR	gvar.player[pn].data
 #define PLAYERBMPDATA		*PLAYERBMPDATAVAR
@@ -88,20 +89,18 @@ 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];
 
@@ -116,7 +115,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);
@@ -206,52 +205,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_*/