inputest manipulates d and q like scroll.exe

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 062e3beef1dba3a4f18bd09bec4f8f5161de9da6..52a767741345c520baa7d5078b7df8e68f075124 100755 (executable)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -919,16 +919,13 @@ register  KeyboardDef     *def;
 //     player[pn].info.dir = DirTable[((my + 1) * 3) + (mx + 1)];\r
        conpee=(((my + 1) * 2) + (mx + 1))-1; //if(conpee) conpee--;\r
        player[pn].info.dir = DirTable[conpee];\r
+\r
+       //TODO: overwriting direction must be added\r
        if(DIRECTIONIFELSEGFXTEST && player[pn].d != player[pn].info.dir) player[pn].pdir=DirTable[conpee];\r
        if(player[pn].q==1 && (mx!=motion_None || my!=motion_None))\r
        {\r
                player[pn].d = player[pn].info.dir;\r
-               //printf("q =%d ", player[pn].q);\r
-               //if(testcontrolnoisy > 0)\r
-                       //if(testcontrolnoisy > 0)\r
-               //printf("cpee=%d ", conpee);\r
        }\r
-       if(testcontrolnoisy > 0)\r
 \r
 #if DEMO0\r
        if (DemoMode == demo_Record)\r

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index e39c400e29554414cb80e87465160af6670c6a1e..ad625ed1ee80f19ec8629e71e0916a3f959b35ed 100755 (executable)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -45,8 +45,8 @@
 extern byte testkeyin,testcontrolnoisy,gfxtest;\r
 \r
 //if else for gfxtesting and direction\r
-#define DIRECTIONIFELSEGFXTEST (player[pn].d == 2 && gfxtest) || (player[pn].info.dir == 2 && !gfxtest)\r
-#define NDIRECTIONIFELSEGFXTEST (player[pn].d != 2 && gfxtest) || (player[pn].info.dir != 2 && !gfxtest)\r
+#define DIRECTIONIFELSEGFXTEST (player[pn].d == 2 || player[pn].info.dir == 2)\r
+#define NDIRECTIONIFELSEGFXTEST        (player[pn].d != 2 || player[pn].info.dir != 2)\r
 \r
 #define        KeyInt  9       // The keyboard ISR number\r
 \r