No more analog mode

It doesn't work well in SRB2Kart :V
Also fixed the player setup name field's _ being 8 px too far to the
right
This commit is contained in:
TehRealSalt 2018-01-16 21:58:48 -05:00
parent 6095337bcc
commit 1ca1673f68
2 changed files with 7 additions and 7 deletions

View file

@ -833,14 +833,14 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_joyscale4); CV_RegisterVar(&cv_joyscale4);
// Analog Control // Analog Control
CV_RegisterVar(&cv_analog); /*CV_RegisterVar(&cv_analog);
CV_RegisterVar(&cv_analog2); CV_RegisterVar(&cv_analog2);
CV_RegisterVar(&cv_analog3); CV_RegisterVar(&cv_analog3);
CV_RegisterVar(&cv_analog4); CV_RegisterVar(&cv_analog4);
CV_RegisterVar(&cv_useranalog); CV_RegisterVar(&cv_useranalog);
CV_RegisterVar(&cv_useranalog2); CV_RegisterVar(&cv_useranalog2);
CV_RegisterVar(&cv_useranalog3); CV_RegisterVar(&cv_useranalog3);
CV_RegisterVar(&cv_useranalog4); CV_RegisterVar(&cv_useranalog4);*/
// s_sound.c // s_sound.c
CV_RegisterVar(&cv_soundvolume); CV_RegisterVar(&cv_soundvolume);

View file

@ -1064,7 +1064,7 @@ static menuitem_t OP_P1ControlsMenu[] =
{IT_STRING | IT_CVAR, NULL, "Camera" , &cv_chasecam , 50}, {IT_STRING | IT_CVAR, NULL, "Camera" , &cv_chasecam , 50},
{IT_STRING | IT_CVAR, NULL, "Crosshair", &cv_crosshair , 60}, {IT_STRING | IT_CVAR, NULL, "Crosshair", &cv_crosshair , 60},
{IT_STRING | IT_CVAR, NULL, "Analog Control", &cv_useranalog, 80}, //{IT_STRING | IT_CVAR, NULL, "Analog Control", &cv_useranalog, 80},
}; };
static menuitem_t OP_P2ControlsMenu[] = static menuitem_t OP_P2ControlsMenu[] =
@ -1076,7 +1076,7 @@ static menuitem_t OP_P2ControlsMenu[] =
{IT_STRING | IT_CVAR, NULL, "Camera" , &cv_chasecam2 , 50}, {IT_STRING | IT_CVAR, NULL, "Camera" , &cv_chasecam2 , 50},
{IT_STRING | IT_CVAR, NULL, "Crosshair", &cv_crosshair2, 60}, {IT_STRING | IT_CVAR, NULL, "Crosshair", &cv_crosshair2, 60},
{IT_STRING | IT_CVAR, NULL, "Analog Control", &cv_useranalog2, 70}, //{IT_STRING | IT_CVAR, NULL, "Analog Control", &cv_useranalog2, 70},
}; };
#ifndef NOFOURPLAYER #ifndef NOFOURPLAYER
@ -1088,7 +1088,7 @@ static menuitem_t OP_P3ControlsMenu[] =
{IT_STRING | IT_CVAR, NULL, "Camera" , &cv_chasecam3 , 40}, {IT_STRING | IT_CVAR, NULL, "Camera" , &cv_chasecam3 , 40},
{IT_STRING | IT_CVAR, NULL, "Crosshair", &cv_crosshair3, 50}, {IT_STRING | IT_CVAR, NULL, "Crosshair", &cv_crosshair3, 50},
{IT_STRING | IT_CVAR, NULL, "Analog Control", &cv_useranalog3, 60}, //{IT_STRING | IT_CVAR, NULL, "Analog Control", &cv_useranalog3, 60},
}; };
static menuitem_t OP_P4ControlsMenu[] = static menuitem_t OP_P4ControlsMenu[] =
@ -1099,7 +1099,7 @@ static menuitem_t OP_P4ControlsMenu[] =
{IT_STRING | IT_CVAR, NULL, "Camera" , &cv_chasecam4 , 40}, {IT_STRING | IT_CVAR, NULL, "Camera" , &cv_chasecam4 , 40},
{IT_STRING | IT_CVAR, NULL, "Crosshair", &cv_crosshair4, 50}, {IT_STRING | IT_CVAR, NULL, "Crosshair", &cv_crosshair4, 50},
{IT_STRING | IT_CVAR, NULL, "Analog Control", &cv_useranalog4, 60}, //{IT_STRING | IT_CVAR, NULL, "Analog Control", &cv_useranalog4, 60},
}; };
#endif #endif
@ -6692,7 +6692,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
// draw text cursor for name // draw text cursor for name
if (!itemOn && skullAnimCounter < 4) // blink cursor if (!itemOn && skullAnimCounter < 4) // blink cursor
V_DrawCharacter(mx + 48 + V_StringWidth(setupm_name, 0), my, '_',false); V_DrawCharacter(mx + 40 + V_StringWidth(setupm_name, 0), my, '_',false);
// SRB2Kart: draw the stat backer // SRB2Kart: draw the stat backer
V_DrawFixedPatch((mx+141)<<FRACBITS, (my+62)<<FRACBITS, FRACUNIT, 0, statbg, NULL); V_DrawFixedPatch((mx+141)<<FRACBITS, (my+62)<<FRACBITS, FRACUNIT, 0, statbg, NULL);