X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in.c;h=925eaeebd976ec8e27d02afd617d8d51c2f0fe96;hb=496c6da40bdf534f4ddf3833aee732d1631e5824;hp=801759ad4757d3fceec5db029144c655b1d42147;hpb=ea73c4bf63130a76e2fb86bf34cef2e4ba56bf88;p=16.git

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 801759ad..925eaeeb 100755
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -38,7 +38,7 @@
 
 #include "src/lib/16_in.h"
 
-byte testkeyin=0,testcontrolnoisy=0;
+byte testkeyin=0,testcontrolnoisy=0,testctrltype=0;
 
 /*
 =============================================================================
@@ -51,7 +51,7 @@ struct inconfig
 {
 	boolean			MousePresent;
 	boolean			JoysPresent[MaxJoys];
-	boolean			JoyPadPresent[MaxPads];
+// 	boolean			JoyPadPresent[MaxPads];
 	boolean		Keyboard[NumCodes];
 	boolean		Paused;
 	char		LastASCII;
@@ -59,7 +59,7 @@ struct inconfig
 
 	KeyboardDef	KbdDefs[MaxKbds];
 	JoystickDef	JoyDefs[MaxJoys];
-	JoypadDef	JoypadDefs[MaxPads];
+// 	JoypadDef	JoypadDefs[MaxPads];
 } inpu;
 
 //extern inconfig inpu;
@@ -659,6 +659,7 @@ IN_Startup()
 		inpu.JoysPresent[i] = checkjoys? INL_StartJoy(i) : false;
 
 	inst.IN_Started = true;
+
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -670,14 +671,15 @@ void
 IN_Default(boolean gotit,player_t *player,ControlType nt)
 {
 	int i;
+	if(testctrltype==0)
 	if
 	(
 		(!gotit)
 	|| 	((nt == ctrl_Joystick1) && !inpu.JoysPresent[0])
 	|| 	((nt == ctrl_Joystick2) && !inpu.JoysPresent[1])
 	|| 	((nt == ctrl_Mouse) && !inpu.MousePresent)
-	|| 	((nt == ctrl_Joypad1) && !inpu.JoyPadPresent[0])
-	|| 	((nt == ctrl_Joypad2) && !inpu.JoyPadPresent[1])
+// 	|| 	((nt == ctrl_Joypad1) && !inpu.JoyPadPresent[0])
+// 	|| 	((nt == ctrl_Joypad2) && !inpu.JoyPadPresent[1])
 	)
 		nt = ctrl_Keyboard1;
 	inpu.KbdDefs[0].button0 = 0x1c;
@@ -841,6 +843,7 @@ 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:
@@ -895,6 +898,8 @@ register	KeyboardDef	*def;
 				buttons += 1 << 1;
 			realdelta = false;
 			break;
+// 		case ctrl_Joypad1:
+// 		case ctrl_Joypad2:
 		case ctrl_Joystick1:
 		case ctrl_Joystick2:
 			INL_GetJoyDelta(type - ctrl_Joystick,&dx,&dy,false);
@@ -906,10 +911,6 @@ register	KeyboardDef	*def;
 			buttons = INL_GetMouseButtons();
 			realdelta = true;
 			break;
-		case ctrl_Joypad1:
-		case ctrl_Joypad2:
-			printf("wwww");
-			break;
 		}
 #ifdef DEMO0
 	}