pdir

diff --git a/src/inputest.c b/src/inputest.c
index f490ab28aee614f6de91869e4be22f105e7b7ef4..5e9297bc2708d0bb063502f49d568fb8aa17481a 100755 (executable)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -31,7 +31,6 @@ main(int argc, char *argv[])
        //extern struct inconfig inpu;\r
        testkeyin=0;\r
        testcontrolnoisy=1;\r
-       gfxtest=0;\r
        IN_Startup();\r
        IN_Default(0,&player,ctrl_Joystick);\r
        //while(!IN_KeyDown(sc_Escape))\r

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 546d3dbdeba290f51e616c14baf8b779d6bf9673..5e03e2f229a42a253311363bc6256cac425b75bc 100755 (executable)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -38,7 +38,7 @@
 \r
 #include "src/lib/16_in.h"\r
 \r
-byte testkeyin=0,testcontrolnoisy=0,gfxtest=0;\r
+byte testkeyin=0,testcontrolnoisy=0;\r
 \r
 /*\r
 =============================================================================\r
@@ -854,6 +854,7 @@ register    KeyboardDef     *def;
                                mx = motion_Left,my = motion_Down;\r
                        else if (Keyboard[def->downright])\r
                                mx = motion_Right,my = motion_Down;*/\r
+                       if(DIRECTIONIFELSEGFXTEST)\r
                        if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){\r
 //                             if(testcontrolnoisy > 0){ printf("ud "); printf("%u ", inpu.Keyboard[def->up]); printf("%u ", inpu.Keyboard[def->down]);}\r
                        if((inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]) || player[pn].pdir == 0)\r
@@ -918,7 +919,7 @@ register    KeyboardDef     *def;
        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].d==2) 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
@@ -951,7 +952,7 @@ register    KeyboardDef     *def;
 #endif\r
 //#ifdef TESTCONTROLNOISY\r
 if(testcontrolnoisy > 0)\r
-if((inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->left] || inpu.Keyboard[def->right]) && NDIRECTIONIFELSEGFXTEST)\r
+//if((inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->left] || inpu.Keyboard[def->right]) && NDIRECTIONIFELSEGFXTEST)\r
 {\r
        printf("q=%d ", player[pn].q);\r
        printf("cpee=%d ", conpee);\r

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index ad625ed1ee80f19ec8629e71e0916a3f959b35ed..9f900aa5d5ac7b23be6bbaf4a993d3c2d5747eaa 100755 (executable)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -42,11 +42,12 @@
 //#define TESTCONTROLNOISY\r
 #endif\r
 \r
-extern byte testkeyin,testcontrolnoisy,gfxtest;\r
+extern byte testkeyin,testcontrolnoisy;\r
 \r
 //if else for gfxtesting and direction\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
+//player[pn].d == 2 ||\r
+#define DIRECTIONIFELSEGFXTEST (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

diff --git a/src/scroll.c b/src/scroll.c
index 6fdee8a648ac54d322720e0d692cf79046cc23b7..162ce8e31098269c92269e020a6e25ed7777501c 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -64,7 +64,7 @@ void main(int argc, char *argv[])
        if(argv[1]) bakapee = atoi(argv[1]);
        else bakapee = 1;
 
-       testcontrolnoisy=1;
+       testcontrolnoisy=0;
 
        player[0].persist_aniframe=0;
        player[0].speed=4;