X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscroll16.h;h=2b5ca92c69be370528b9e6aab3ccd2656971656b;hb=5c3da8981be76348ea34711b6297c0d2d3ed19ab;hp=48eecf8914b329fef745638ccf401ad4b27c3f60;hpb=fe83dc972e62ab0db157d5a953db2f5236876d67;p=16.git

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 48eecf89..2b5ca92c 100755
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -55,7 +55,7 @@
 #define PCXBMPPTR	PCXBMPVAR
 
 //row and colum drawing routines
-#define FULLRCREND
+//#define FULLRCREND
 #define DRAWCOLNUM mv->page[id].dx
 #define DRAWROWNUM mv->page[id].dy
 //#define DRAWCOLNUM pl[plid].enti.q
@@ -65,6 +65,11 @@
 #define MAPW	40
 #define MAPH	30
 
+extern struct glob_game_vars	*ggvv;
+#ifdef __DEBUG_RF__
+#define DBG_RFDELAYMETHOD delay(250);
+#endif
+
 //===========================================================================//
 
 	//if(gvar.player[0].enti.hp==0) printf("%d wwww\n", gvar.player[0].enti.y+8);
@@ -80,10 +85,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");\
@@ -111,7 +118,7 @@ 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);
@@ -130,7 +137,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 )
@@ -147,7 +154,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)
@@ -164,7 +171,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 )
@@ -181,7 +188,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 )