From: sparky4 <sparky4@cock.li>
Date: Wed, 29 Nov 2017 21:17:49 +0000 (-0600)
Subject: i did some minor things including commenting out some joy stick timing stuff and... 
X-Git-Url: http://git.osdn.net/view?p=proj16%2F16.git;a=commitdiff_plain;h=5c3da8981be76348ea34711b6297c0d2d3ed19ab

i did some minor things including commenting out some joy stick timing stuff and trying to reprep tile scroll stuff again. although i NEED to look at id_rf.c
---

diff --git a/OUT.ANI b/OUT.ANI
deleted file mode 100755
index e69de29b..00000000
diff --git a/src/lib/16_dbg.h b/src/lib/16_dbg.h
index a500b9b2..f71f545b 100755
--- a/src/lib/16_dbg.h
+++ b/src/lib/16_dbg.h
@@ -36,7 +36,7 @@
 //#define __DEBUG_CA__
 //#define __DEBUG_PM__
 //#define __DEBUG_MM__
-//#define __DEBUG_RF__
+#define __DEBUG_RF__
 #define __DEBUG_SPRI__
 #define __DEBUG_VL__
 #endif
diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index bdd3d0fe..0ac77f15 100755
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -377,9 +377,9 @@ done:
 void INL_GetJoyDelta(word joy,int *dx,int *dy/*,boolean adaptive*/, global_game_variables_t *gvar)
 {
 	word		x,y;
-	word TimeCount = *clockw;
+//00	word TimeCount = *clockw;
 	JoystickDef	*def;
-static	word	lasttime;
+//00static	word	lasttime;
 
 	IN_GetJoyAbs(joy,&x,&y);
 	def = gvar->in.JoyDefs + joy;
@@ -440,7 +440,7 @@ static	word	lasttime;
 //			*dy *= time;
 //		}
 //	}
-	lasttime = TimeCount;
+//00	lasttime = TimeCount;
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -470,15 +470,15 @@ register	word	result;
 word
 IN_GetJoyButtonsDB(word joy)
 {
-	word TimeCount = *clockw;
-	word	lasttime;
+//00	word TimeCount = *clockw;
+//00	word	lasttime;
 	word		result1,result2;
 
 	do
 	{
 		result1 = INL_GetJoyButtons(joy);
-		lasttime = TimeCount;
-		while(TimeCount == lasttime)
+//00		lasttime = TimeCount;
+//00		while(TimeCount == lasttime)
 			//;
 		result2 = INL_GetJoyButtons(joy);
 	} while(result1 != result2);
diff --git a/src/lib/16_tail.h b/src/lib/16_tail.h
index 4993b4e6..2689de7c 100755
--- a/src/lib/16_tail.h
+++ b/src/lib/16_tail.h
@@ -72,7 +72,6 @@
 #undef SPRIDEBUGFUNCTIONS
 #define SPRIDEBUGFUNCTIONS \
 	if(gvar.in.inst->Keyboard[sc_Y]){ dbg_delayanimation=!dbg_delayanimation;				IN_UserInput(1, &gvar); }
-//	if(gvar.in.inst->Keyboard[sc_F9]){ dbg_pagenorendermap=!dbg_pagenorendermap;			IN_UserInput(1, &gvar); }
 #endif*/
 
 #define TAIL_FUNCTIONKEYFUNCTIONS0EXE \
diff --git a/src/lib/doslib b/src/lib/doslib
index 53e2844b..c6cb5cab 160000
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit 53e2844bbdf62f9b1636b01ba4ccc03668e572c5
+Subproject commit c6cb5cabeb8a4ff273bc07a04ed40590f004b275
diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 42b2621f..f3f054d1 100755
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -759,7 +759,7 @@ if(dbg_pagedelayrendermap)		if(!y)	y+=TILEWH;	else	y-=TILEWH;
 	poopoffset%=player[0].enti.spt;
 //printf("y: %d\n", poopoffset);
 #ifdef __DEBUG_RF__
-if(dbg_pagedelayrendermap){ sprintf(global_temp_status_text, "%-3u", mv->dx); modexprint(mv[0].page, player[0].enti.x, player[0].enti.y-28-(poopoffset*8) , 1, 0, PALMAPDRAWW, 1, 1, global_temp_status_text); }
+if(dbg_pagedelayrendermap){ sprintf(global_temp_status_text, "%-3u", poopoffset); modexprint(mv->page, player[0].enti.x, player[0].enti.y-28-(poopoffset*8) , 1, 0, PALMAPDRAWW, 1, 1, global_temp_status_text); }
 #endif
 	/* the position within the map array */
 	i=ty * mv->map->width + tx;
@@ -775,7 +775,7 @@ if(dbg_pagedelayrendermap){ sprintf(global_temp_status_text, "%-3u", mv->dx); mo
 		i++; /* next! */
 	}
 #ifdef __DEBUG_RF__
-if(dbg_pagedelayrendermap) delay(200);
+if(dbg_pagedelayrendermap) DBG_RFDELAYMETHOD;
 #endif
 }
 
@@ -788,7 +788,7 @@ if(dbg_pagedelayrendermap)		if(!x)	x+=TILEWH;		else	x-=TILEWH;
 	poopoffset%=player[0].enti.spt;
 //printf("x: %d\n", poopoffset);
 #ifdef __DEBUG_RF__
-if(dbg_pagedelayrendermap){ sprintf(global_temp_status_text, "%-3u", mv->dy); modexprint(mv[0].page, player[0].enti.x, player[0].enti.y-28-(poopoffset*8) , 1, 0, PALMAPDRAWW, 1, global_temp_status_text); }
+if(dbg_pagedelayrendermap){ sprintf(global_temp_status_text, "%-3u", poopoffset); modexprint(mv->page, player[0].enti.x, player[0].enti.y-28-(poopoffset*8) , 1, 0, PALMAPDRAWW, 1, 1, global_temp_status_text); }
 #endif
 	/* location in the map array */
 	i=ty * mv->map->width + tx;
@@ -806,7 +806,7 @@ if(dbg_pagedelayrendermap){ sprintf(global_temp_status_text, "%-3u", mv->dy); mo
 		i += mv->map->width;
 	}
 #ifdef __DEBUG_RF__
-if(dbg_pagedelayrendermap) delay(200);
+if(dbg_pagedelayrendermap) DBG_RFDELAYMETHOD;
 #endif
 }
 
diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 3c7bc559..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);
diff --git a/src/xcroll.c b/src/xcroll.c
index 3126f7da..e72af2ff 100755
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -28,7 +28,7 @@
 
 //#define NOMAPLOAD
 //#define OLDPLAYERSPRITESTUFF
-#define XC_CTRLTYPE ctrl_Joystick1//ctrl_Mouse//ctrl_Keyboard
+#define XC_CTRLTYPE ctrl_Keyboard//ctrl_Joystick1//ctrl_Mouse
 #ifdef __DEBUG__
 #define SCROLLEXEDEBUG
 #endif