src/console.c

@@ -968,7 +968,7 @@ boolean CON_Responder(event_t *ev)
 		return false;
 
 	// let go keyup events, don't eat them
-	if (ev->type != ev_keydown && ev->type != ev_text && ev->type != ev_console)
+	if (ev->type != ev_keydown && ev->type != ev_console)
 	{
 		if (ev->key == gamecontrol[GC_CONSOLE][0] || ev->key == gamecontrol[GC_CONSOLE][1])
 			consdown = false;

src/g_game.c

@@ -867,6 +867,35 @@ INT16 G_SoftwareClipAimingPitch(INT32 *aiming)
 	return (INT16)((*aiming)>>16);
 }
 
+#ifdef OLD_GAMEPAD_AXES
+static gamepad_axis_e ConvertXboxControllerAxes(int type)
+{
+	switch (type)
+	{
+		// Left stick
+		case 1: // X-Axis
+			return GAMEPAD_AXIS_LEFTX;
+		case 2: // Y-Axis
+			return GAMEPAD_AXIS_LEFTY;
+
+		// Right stick
+		case 4: // X-Rudder
+			return GAMEPAD_AXIS_RIGHTX;
+		case 5: // Y-Rudder
+			return GAMEPAD_AXIS_RIGHTY;
+
+		// Triggers
+		case 3: // Z-Axis
+			return GAMEPAD_AXIS_TRIGGERLEFT;
+		case 6: // Z-Rudder
+			return GAMEPAD_AXIS_TRIGGERRIGHT;
+
+		default: // All the other ones
+			return NUM_GAMEPAD_AXES;
+	}
+}
+#endif
+
 INT32 JoyAxis(joyaxis_e axissel)
 {
 	INT32 retaxis;
@@ -977,7 +1006,6 @@ INT32 Joy2Axis(joyaxis_e axissel)
 			return 0;
 	}
 
-
 	if (axisval < 0) //odd -axises
 	{
 		axisval = -axisval;
@@ -1096,6 +1124,7 @@ angle_t localangle, localangle2;
 static fixed_t forwardmove[2] = {25<<FRACBITS>>16, 50<<FRACBITS>>16};
 static fixed_t sidemove[2] = {25<<FRACBITS>>16, 50<<FRACBITS>>16}; // faster!
 static fixed_t angleturn[3] = {640, 1280, 320}; // + slow turn
+static INT32 camtoggledelay[2] = {0, 0};
 
 INT16 ticcmd_oldangleturn[2];
 boolean ticcmd_centerviewdown[2]; // For simple controls, lock the camera behind the player
@@ -1114,6 +1143,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 	boolean strafeisturn; // Simple controls only
 	player_t *player = &players[ssplayer == 2 ? secondarydisplayplayer : consoleplayer];
 	camera_t *thiscam = ((ssplayer == 1 || player->bot == BOT_2PHUMAN) ? &camera : &camera2);
+	//consvar_t *chasecamcv = (ssplayer == 1 ? &cv_chasecam : &cv_chasecam2);
 	angle_t *myangle = (ssplayer == 1 ? &localangle : &localangle2);
 	INT32 *myaiming = (ssplayer == 1 ? &localaiming : &localaiming2);
 
@@ -1488,7 +1518,18 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 	}
 	else
 		resetdown[forplayer] = false;
+	
+/*
+	if (G_PlayerInputDown(forplayer, GC_CAMTOGGLE))
+	{
+		if (!camtoggledelay[forplayer])
+		{
+			camtoggledelay[forplayer] = NEWTICRATE / 6;
+			CV_SetValue(chasecamcv, chasecamcv->value ? 0 : 1);
+		}
+	}
 
+*/
 
 	// jump button
 	axis = PlayerJoyAxis(ssplayer, JA_JUMP);
@@ -2002,7 +2043,6 @@ boolean G_IsTitleCardAvailable(void)
 
 INT32 pausedelay = 0;
 boolean pausebreakkey = false;
-static INT32 camtoggledelay, camtoggledelay2 = 0;
 
 static boolean ViewpointSwitchResponder(event_t *ev)
 {
@@ -2207,24 +2247,6 @@ boolean G_Responder(event_t *ev)
 					}
 				}
 			}
-			if (ev->key == gamecontrol[GC_CAMTOGGLE][0]
-				|| ev->key == gamecontrol[GC_CAMTOGGLE][1])
-			{
-				if (!camtoggledelay)
-				{
-					camtoggledelay = NEWTICRATE / 7;
-					CV_SetValue(&cv_chasecam, cv_chasecam.value ? 0 : 1);
-				}
-			}
-			if (ev->key == gamecontrolbis[GC_CAMTOGGLE][0]
-				|| ev->key == gamecontrolbis[GC_CAMTOGGLE][1])
-			{
-				if (!camtoggledelay2)
-				{
-					camtoggledelay2 = NEWTICRATE / 7;
-					CV_SetValue(&cv_chasecam2, cv_chasecam2.value ? 0 : 1);
-				}
-			}
 			return true;
 
 		case ev_keyup:
@@ -2500,23 +2522,13 @@ void G_Ticker(boolean run)
 	if (run)
 	{
 		if (pausedelay && pausedelay != INT32_MIN)
-		{
-			if (pausedelay > 0)
-				pausedelay--;
-			else
-				pausedelay++;
-		}
+			(pausedelay > 0) ? pausedelay-- : pausedelay++;
 
-		if (camtoggledelay)
-			camtoggledelay--;
-
-		if (camtoggledelay2)
-			camtoggledelay2--;
+		for (i = 0; i < 2; i++)
+			if (camtoggledelay[i]) camtoggledelay[i]--;
 
 		if (gametic % NAMECHANGERATE == 0)
-		{
 			memset(player_name_changes, 0, sizeof player_name_changes);
-		}
 	}
 }