diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 7f9b8224..24105770 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -316,7 +316,8 @@ consvar_t cv_lightning = {"lightning", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, consvar_t cv_karthud = {"karthud", "Default", CV_SAVE|CV_CALL, karthud_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_kartcc = {"kartcc", "100cc", CV_NETVAR, kartcc_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_mphspeed = {"mphspeed", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // use tics in display +static CV_PossibleValue_t speedometer_cons_t[] = {{0, "Off"}, {1, "Kilometers"}, {2, "Miles"}, {3, "Fracunits"}, {0, NULL}}; +consvar_t cv_speedometer = {"speedometer", "Kilometers", CV_SAVE, speedometer_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; // use tics in display // consvar_t cv_ringslinger = {"ringslinger", "No", CV_NETVAR|CV_NOSHOWHELP|CV_CALL|CV_CHEAT, CV_YesNo, diff --git a/src/d_netcmd.h b/src/d_netcmd.h index fecc42d2..6fb524d1 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -106,7 +106,7 @@ extern consvar_t cv_blueshell, cv_jaws, cv_fireflower, cv_tripleredshell, cv_lig extern consvar_t cv_karthud; extern consvar_t cv_kartcc; -extern consvar_t cv_mphspeed; +extern consvar_t cv_speedometer; // extern consvar_t cv_itemfinder; diff --git a/src/k_kart.c b/src/k_kart.c index 96f46e9e..9b751d63 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -294,7 +294,7 @@ void K_RegisterKartStuff(void) CV_RegisterVar(&cv_lightning); CV_RegisterVar(&cv_kartcc); - CV_RegisterVar(&cv_mphspeed); + CV_RegisterVar(&cv_speedometer); } //} @@ -3288,16 +3288,21 @@ static void K_DrawKartPositionFaces(void) static void K_drawKartSpeedometer(void) { fixed_t convSpeed; - if (!cv_mphspeed.value) + if (cv_speedometer.value == 1) { convSpeed = FixedMul(stplyr->speed, 142371)/FRACUNIT; // 2.172409058 V_DrawKartString(9, STRINGY(155), 0, va("%3d km/h", convSpeed)); } - else + else if (cv_speedometer.value == 2) { convSpeed = FixedMul(stplyr->speed, 88465)/FRACUNIT; // 1.349868774 V_DrawKartString(9, STRINGY(155), 0, va("%3d mph", convSpeed)); } + else if (cv_speedometer.value == 3) + { + convSpeed = stplyr->speed/FRACUNIT; + V_DrawKartString(9, STRINGY(155), 0, va("%3d Fracunits/s", convSpeed)); + } } void K_drawKartHUD(void)