i did some minor things including commenting out some joy stick timing stuff and...

diff --git a/OUT.ANI b/OUT.ANI
deleted file mode 100755 (executable)
index e69de29..0000000

diff --git a/src/lib/16_dbg.h b/src/lib/16_dbg.h
index a500b9b211c64c12fb65a11f4ae2f79ee4bd8e37..f71f545b59181d5c3ed4d71337dffbcbf3c97cb3 100755 (executable)
--- a/src/lib/16_dbg.h
+++ b/src/lib/16_dbg.h
@@ -36,7 +36,7 @@
 //#define __DEBUG_CA__\r
 //#define __DEBUG_PM__\r
 //#define __DEBUG_MM__\r
-//#define __DEBUG_RF__\r
+#define __DEBUG_RF__\r
 #define __DEBUG_SPRI__\r
 #define __DEBUG_VL__\r
 #endif\r

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index bdd3d0fe47554db0db169cbe3b761b4f2fec9e96..0ac77f15d5cb49a06d6ce0a0e6bdf27cde49666c 100755 (executable)
--- 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)\r
 {\r
        word            x,y;\r
-       word TimeCount = *clockw;\r
+//00   word TimeCount = *clockw;\r
        JoystickDef     *def;\r
-static word    lasttime;\r
+//00static     word    lasttime;\r
 \r
        IN_GetJoyAbs(joy,&x,&y);\r
        def = gvar->in.JoyDefs + joy;\r
@@ -440,7 +440,7 @@ static      word    lasttime;
 //                     *dy *= time;\r
 //             }\r
 //     }\r
-       lasttime = TimeCount;\r
+//00   lasttime = TimeCount;\r
 }\r
 \r
 ///////////////////////////////////////////////////////////////////////////\r
@@ -470,15 +470,15 @@ register  word    result;
 word\r
 IN_GetJoyButtonsDB(word joy)\r
 {\r
-       word TimeCount = *clockw;\r
-       word    lasttime;\r
+//00   word TimeCount = *clockw;\r
+//00   word    lasttime;\r
        word            result1,result2;\r
 \r
        do\r
        {\r
                result1 = INL_GetJoyButtons(joy);\r
-               lasttime = TimeCount;\r
-               while(TimeCount == lasttime)\r
+//00           lasttime = TimeCount;\r
+//00           while(TimeCount == lasttime)\r
                        //;\r
                result2 = INL_GetJoyButtons(joy);\r
        } while(result1 != result2);\r

diff --git a/src/lib/16_tail.h b/src/lib/16_tail.h
index 4993b4e6cee18344b43bba496cfde2209dcfe8da..2689de7c3377baa0eb370b8b9846521bada5c225 100755 (executable)
--- a/src/lib/16_tail.h
+++ b/src/lib/16_tail.h
@@ -72,7 +72,6 @@
 #undef SPRIDEBUGFUNCTIONS\r
 #define SPRIDEBUGFUNCTIONS \\r
        if(gvar.in.inst->Keyboard[sc_Y]){ dbg_delayanimation=!dbg_delayanimation;                               IN_UserInput(1, &gvar); }\r
-//     if(gvar.in.inst->Keyboard[sc_F9]){ dbg_pagenorendermap=!dbg_pagenorendermap;                    IN_UserInput(1, &gvar); }\r
 #endif*/\r
 \r
 #define TAIL_FUNCTIONKEYFUNCTIONS0EXE \\r

diff --git a/src/lib/doslib b/src/lib/doslib
index 53e2844bbdf62f9b1636b01ba4ccc03668e572c5..c6cb5cabeb8a4ff273bc07a04ed40590f004b275 160000 (submodule)
--- 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 42b2621f8416645313f103b9b32ed4513488aa66..f3f054d1edc7ea1fdcb5269b2e780a86a92dfc01 100755 (executable)
--- 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;\r
 //printf("y: %d\n", poopoffset);\r
 #ifdef __DEBUG_RF__\r
-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); }\r
+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); }\r
 #endif\r
        /* the position within the map array */\r
        i=ty * mv->map->width + tx;\r
@@ -775,7 +775,7 @@ if(dbg_pagedelayrendermap){ sprintf(global_temp_status_text, "%-3u", mv->dx); mo
                i++; /* next! */\r
        }\r
 #ifdef __DEBUG_RF__\r
-if(dbg_pagedelayrendermap) delay(200);\r
+if(dbg_pagedelayrendermap) DBG_RFDELAYMETHOD;\r
 #endif\r
 }\r
 \r
@@ -788,7 +788,7 @@ if(dbg_pagedelayrendermap)          if(!x)  x+=TILEWH;              else    x-=TILEWH;
        poopoffset%=player[0].enti.spt;\r
 //printf("x: %d\n", poopoffset);\r
 #ifdef __DEBUG_RF__\r
-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); }\r
+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); }\r
 #endif\r
        /* location in the map array */\r
        i=ty * mv->map->width + tx;\r
@@ -806,7 +806,7 @@ if(dbg_pagedelayrendermap){ sprintf(global_temp_status_text, "%-3u", mv->dy); mo
                i += mv->map->width;\r
        }\r
 #ifdef __DEBUG_RF__\r
-if(dbg_pagedelayrendermap) delay(200);\r
+if(dbg_pagedelayrendermap) DBG_RFDELAYMETHOD;\r
 #endif\r
 }\r
 \r

diff --git a/src/lib/scroll16.h b/src/lib/scroll16.h
index 3c7bc5597e261a20cd4a955f4c71e86792d5c449..2b5ca92c69be370528b9e6aab3ccd2656971656b 100755 (executable)
--- a/src/lib/scroll16.h
+++ b/src/lib/scroll16.h
@@ -55,7 +55,7 @@
 #define PCXBMPPTR      PCXBMPVAR\r
 \r
 //row and colum drawing routines\r
-#define FULLRCREND\r
+//#define FULLRCREND\r
 #define DRAWCOLNUM mv->page[id].dx\r
 #define DRAWROWNUM mv->page[id].dy\r
 //#define DRAWCOLNUM pl[plid].enti.q\r
@@ -65,6 +65,11 @@
 #define MAPW   40\r
 #define MAPH   30\r
 \r
+extern struct glob_game_vars   *ggvv;\r
+#ifdef __DEBUG_RF__\r
+#define DBG_RFDELAYMETHOD delay(250);\r
+#endif\r
+\r
 //===========================================================================//\r
 \r
        //if(gvar.player[0].enti.hp==0) printf("%d wwww\n", gvar.player[0].enti.y+8);\r

diff --git a/src/xcroll.c b/src/xcroll.c
index 3126f7da4651f0d0dcdcf48c725c78d99ed67a02..e72af2ff57843ff44f993a0c46b8a9011c830c9c 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -28,7 +28,7 @@
 \r
 //#define NOMAPLOAD\r
 //#define OLDPLAYERSPRITESTUFF\r
-#define XC_CTRLTYPE ctrl_Joystick1//ctrl_Mouse//ctrl_Keyboard\r
+#define XC_CTRLTYPE ctrl_Keyboard//ctrl_Joystick1//ctrl_Mouse\r
 #ifdef __DEBUG__\r
 #define SCROLLEXEDEBUG\r
 #endif\r