cleanup controller menu stuff a little more
This commit is contained in:
1 parent
604fa7281b
commit
56bb20f4e1
1 file changed
+16
-44
+16
-44
@@ -9205,7 +9205,7 @@ static void M_DrawJoystick(void)
|
||||
compareval4 = cv_usejoystick[3].value;
|
||||
compareval3 = cv_usejoystick[2].value;
|
||||
compareval2 = cv_usejoystick[1].value;
|
||||
compareval = cv_usejoystick[0].value;
|
||||
compareval = cv_usejoystick[0].value;
|
||||
#endif
|
||||
|
||||
if ((setupcontrolplayer == 4 && (i == compareval4))
|
||||
@@ -9244,14 +9244,13 @@ void M_SetupJoystickMenu(INT32 choice)
|
||||
//
|
||||
// Update cv_usejoystick.string here so that the user can
|
||||
// properly change this value.
|
||||
if (i == cv_usejoystick[0].value)
|
||||
CV_SetValue(&cv_usejoystick[0], i);
|
||||
if (i == cv_usejoystick[1].value)
|
||||
CV_SetValue(&cv_usejoystick[1], i);
|
||||
if (i == cv_usejoystick[2].value)
|
||||
CV_SetValue(&cv_usejoystick[2], i);
|
||||
if (i == cv_usejoystick[3].value)
|
||||
CV_SetValue(&cv_usejoystick[3], i);
|
||||
for (INT32 f = 0; f < MAXSPLITSCREENPLAYERS; f++)
|
||||
{
|
||||
if (i == cv_usejoystick[f].value)
|
||||
{
|
||||
CV_SetValue(&cv_usejoystick[f], i);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -9291,8 +9290,8 @@ static void M_DoAssignJoystick(UINT8 pnum, INT32 choice)
|
||||
{
|
||||
INT32 oldchoice, oldstringchoice;
|
||||
|
||||
#define joynum atoi(cv_usejoystick[pnum].string)
|
||||
#define joyoldchoice (joynum > numcontrollers ? joynum : cv_usejoystick[pnum].value)
|
||||
#define joystrnum (atoi(cv_usejoystick[pnum].string))
|
||||
#define joyoldchoice ((joystrnum > numcontrollers) ? joystrnum : cv_usejoystick[pnum].value)
|
||||
|
||||
oldchoice = oldstringchoice = joyoldchoice;
|
||||
CV_SetValue(&cv_usejoystick[pnum], choice);
|
||||
@@ -9304,14 +9303,15 @@ static void M_DoAssignJoystick(UINT8 pnum, INT32 choice)
|
||||
{
|
||||
CV_SetValue(&cv_usejoystick[pnum], cv_usejoystick[pnum].value);
|
||||
|
||||
if (oldchoice > numcontrollers) /* reset this so the comparison is valid*/
|
||||
// reset this so the comparison is valid
|
||||
if (oldchoice > numcontrollers)
|
||||
oldchoice = cv_usejoystick[pnum].value;
|
||||
|
||||
if (oldchoice != choice)
|
||||
{
|
||||
if (choice && oldstringchoice > numcontrollers) // if we did not select "None", we likely selected a used device
|
||||
{
|
||||
CV_SetValue(&cv_usejoystick[pnum], (oldstringchoice > numcontrollers ? oldstringchoice : oldchoice));
|
||||
CV_SetValue(&cv_usejoystick[pnum], ((oldstringchoice > numcontrollers) ? oldstringchoice : oldchoice));
|
||||
}
|
||||
|
||||
if (oldstringchoice == joyoldchoice)
|
||||
@@ -9323,7 +9323,7 @@ static void M_DoAssignJoystick(UINT8 pnum, INT32 choice)
|
||||
}
|
||||
}
|
||||
}
|
||||
#undef joynum
|
||||
#undef joystrnum
|
||||
#undef joyoldchoice
|
||||
}
|
||||
#endif
|
||||
@@ -9331,37 +9331,9 @@ static void M_DoAssignJoystick(UINT8 pnum, INT32 choice)
|
||||
static void M_AssignJoystick(INT32 choice)
|
||||
{
|
||||
#ifdef JOYSTICK_HOTPLUG
|
||||
switch (setupcontrolplayer)
|
||||
{
|
||||
case 4:
|
||||
M_DoAssignJoystick(3, choice);
|
||||
break;
|
||||
case 3:
|
||||
M_DoAssignJoystick(2, choice);
|
||||
break;
|
||||
case 2:
|
||||
M_DoAssignJoystick(1, choice);
|
||||
break;
|
||||
case 1:
|
||||
M_DoAssignJoystick(0, choice);
|
||||
break;
|
||||
}
|
||||
M_DoAssignJoystick((setupcontrolplayer-1), choice);
|
||||
#else
|
||||
switch (setupcontrolplayer)
|
||||
{
|
||||
case 4:
|
||||
CV_SetValue(&cv_usejoystick[3], choice);
|
||||
break;
|
||||
case 3:
|
||||
CV_SetValue(&cv_usejoystick[2], choice);
|
||||
break;
|
||||
case 2:
|
||||
CV_SetValue(&cv_usejoystick[1], choice);
|
||||
break;
|
||||
case 1:
|
||||
CV_SetValue(&cv_usejoystick[0], choice);
|
||||
break;
|
||||
}
|
||||
CV_SetValue(&cv_usejoystick[(setupcontrolplayer-1)], choice);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user