X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscroll16.h;h=8aceac205e5fb63caa6122a8c801812ce0698580;hb=a565be31ce92d6168ae6983042da75b0b683e52b;hp=0cd71b63f42e92eaba99d57de47e2a6080fe48c8;hpb=2fb58644b5c539decd246968bc9cc99b94069364;p=16.git

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 0cd71b63..8aceac20 100755
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2019 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -42,8 +42,7 @@
 #define SPRITE
 //#define TILERENDER
 
-//0000
-#define SHOWFPS
+//0000#define SHOWFPS
 //#define OLDWALKSHOWPAGESTUFF
 
 
@@ -57,15 +56,23 @@
 
 //row and colum drawing routines
 #define FULLRCREND
+//#ifdef FULLRCREND
 #define DRAWCOLNUM mv->page[id].dx
 #define DRAWROWNUM mv->page[id].dy
-//#define DRAWCOLNUM pl[plid].enti.q
-//#define DRAWROLNUM pl[plid].enti.q
+//#else
+//#define DRAWCOLNUM player[plid].enti.q
+//#define DRAWROWNUM player[plid].enti.q
+//#endif
 
 //for null map!
 #define MAPW	40
 #define MAPH	30
 
+extern struct glob_game_vars	*ggvv;
+#ifdef __DEBUG_RF__
+#define DBG_RFDELAYMETHOD delay(500);
+#endif
+
 //===========================================================================//
 
 	//if(gvar.player[0].enti.hp==0) printf("%d wwww\n", gvar.player[0].enti.y+8);
@@ -86,7 +93,7 @@
 	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");\
@@ -126,14 +133,14 @@ void mapGoTo(map_view_t *mv, int tx, int ty);
 void ZC_mapinitMV(map_view_t *mv, int tx, int ty);
 void ZC_mapredraw(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 *player, word poopoffset);
-void near mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *player, word poopoffset);
+void near mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *player);
+void near mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *player);
 void mapDrawWRow(map_view_t *mv, int tx, int ty, word y);
 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 )
@@ -150,7 +157,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)
@@ -167,7 +174,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 )
@@ -184,7 +191,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 )