Commit: 7fffafe71a9d84c527b697b6c556861857fc1eae - project16 (git)

wwww

Commit MetaInfo

• Revision: 7fffafe71a9d84c527b697b6c556861857fc1eae (tree)
• Time: 2016-08-10 21:19:02
• Author: sparky4 <sparky4@cock...>
• Commiter: sparky4

Log Message

wwww

Change Summary

• modified: src/inputest.c
• modified: src/lib/16_in.c
• modified: src/lib/16_in.h
• modified: src/lib/jsmn

Incremental Difference

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

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

--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -43,7 +43,7 @@
 //#define TESTCONTROLNOISY
 #endif
 
-extern boolean testkeyin,testcontrolnoisy,testctrltype;
+extern boolean testkeyin,testcontrolnoisy;
 
 //if else for gfxtesting and direction
 //player[pn].d == 2 ||

--- a/src/lib/jsmn
+++ b/src/lib/jsmn
@@ -1 +1 @@
-Subproject commit d1c85c569d11b8f014858982d5744b5139c52cc1
+Subproject commit 6021415cc75e7922d45b12935f56348b064d8a7f