wwww

diff --git a/src/inputest.c b/src/inputest.c
index 1ecd09d6cb4a163add06e4ec862f4466f5db9201..fc1fc4c1a43036bbe625228f1150b84617855fde 100755 (executable)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -31,8 +31,7 @@ main(int argc, char *argv[])
        player_t player[MaxPlayers];\r
        //extern struct inconfig inpu;\r
        testkeyin=1;\r
-       testcontrolnoisy=0;\r
-       testctrltype=0;\r
+       testcontrolnoisy=1;\r
        IN_Startup();\r
        IN_Default(0,&player,ctrl_Joystick1);\r
        //while(!IN_KeyDown(sc_Escape))\r
@@ -107,5 +106,4 @@ main(int argc, char *argv[])
        printf("version %s\n", VERSION);\r
        printf("testkeyin=%u\n", testkeyin);\r
        printf("testcontrolnoisy=%u\n", testcontrolnoisy);\r
-       printf("testctrltype=%u\n", testctrltype);\r
 }\r

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index aa3f30eea93b541be7408e12b9b7d0eeb875c297..22b135d11103a4793f3383db714924568135beb6 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
-boolean testkeyin=0,testcontrolnoisy=0,testctrltype=0;\r
+boolean testkeyin=0,testcontrolnoisy=0;\r
 \r
 /*\r
 =============================================================================\r
@@ -673,7 +673,6 @@ void
 IN_Default(boolean gotit,player_t *player,ControlType nt)\r
 {\r
        int i;\r
-       if(testctrltype==0)\r
        if\r
        (\r
                (!gotit)\r
@@ -843,7 +842,6 @@ register    KeyboardDef     *def;
        else\r
        {\r
 #endif\r
-               if(testctrltype>0) printf("player[pn].Controls=%c\n", player[pn].Controls);\r
                switch (type = player[pn].Controls)\r
                {\r
                case ctrl_Keyboard1:\r
@@ -969,9 +967,8 @@ register    KeyboardDef     *def;
                }\r
        }\r
 #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]) || player[pn].q>1)\r
+if(player[pn].d/*(inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->left] || inpu.Keyboard[def->right])*/ || player[pn].q>1)\r
 {\r
        printf("q=%d ", player[pn].q);\r
        printf("cpee=%c ", dirchar(conpee));\r
@@ -979,9 +976,10 @@ if((inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->lef
        //printf("(my)=%d       ", my);\r
        //printf("[%d]  ", mx+my);\r
        printf("pdir=%c d=%c dir=%c ", dirchar(player[pn].pdir), dirchar(player[pn].d), dirchar(player[pn].info.dir));\r
-       printf("%c%d %c%d %c%d %c%d\n", dirchar(0), inpu.Keyboard[def->up], dirchar(4), inpu.Keyboard[def->down], dirchar(1), inpu.Keyboard[def->left], dirchar(3), inpu.Keyboard[def->right]);\r
+       if(realdelta) printf("dx=%u dy=%u mx=%u my=%u", player[pn].info.x, player[pn].info.y, player[pn].info.xaxis, player[pn].info.yaxis);\r
+       else if(!realdelta) printf("%c%d %c%d %c%d %c%d", dirchar(0), inpu.Keyboard[def->up], dirchar(4), inpu.Keyboard[def->down], dirchar(1), inpu.Keyboard[def->left], dirchar(3), inpu.Keyboard[def->right]);\r
+       printf("\n");\r
 }\r
-//#endif\r
 }\r
 \r
 ///////////////////////////////////////////////////////////////////////////\r

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index c88da99d906e055c65c9a5afbc81135dd6748be0..db63e4980a2dabcc89cfc92a251b2adfc307a312 100755 (executable)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -43,7 +43,7 @@
 //#define TESTCONTROLNOISY\r
 #endif\r
 \r
-extern boolean testkeyin,testcontrolnoisy,testctrltype;\r
+extern boolean testkeyin,testcontrolnoisy;\r
 \r
 //if else for gfxtesting and direction\r
 //player[pn].d == 2 ||\r

diff --git a/src/lib/jsmn b/src/lib/jsmn
index d1c85c569d11b8f014858982d5744b5139c52cc1..6021415cc75e7922d45b12935f56348b064d8a7f 160000 (submodule)
--- a/src/lib/jsmn
+++ b/src/lib/jsmn
@@ -1 +1 @@
-Subproject commit d1c85c569d11b8f014858982d5744b5139c52cc1
+Subproject commit 6021415cc75e7922d45b12935f56348b064d8a7f