diff --git a/src/d_netcmd.c b/src/d_netcmd.c index b97ac70ba..2293530d0 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -316,6 +316,7 @@ 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 // 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 1d1bbf737..fecc42d2b 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -106,6 +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_itemfinder; diff --git a/src/k_kart.c b/src/k_kart.c index 908d1108b..acad4f2e0 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -294,6 +294,7 @@ void K_RegisterKartStuff(void) CV_RegisterVar(&cv_lightning); CV_RegisterVar(&cv_kartcc); + CV_RegisterVar(&cv_mphspeed); } //} @@ -3266,8 +3267,17 @@ static void K_DrawKartPositionFaces(void) static void K_drawKartSpeedometer(void) { - fixed_t kmphSpeed = FixedMul(stplyr->speed, 142371)/FRACUNIT; // 2.172409058 - V_DrawKartString(9, STRINGY(155), 0, va("%3d km/h", kmphSpeed)); + fixed_t convSpeed; + if (!cv_mphspeed.value) + { + convSpeed = FixedMul(stplyr->speed, 142371)/FRACUNIT; // 2.172409058 + V_DrawKartString(9, STRINGY(155), 0, va("%3d km/h", convSpeed)); + } + else + { + convSpeed = FixedMul(stplyr->speed, 88465)/FRACUNIT; // 1.349868774 + V_DrawKartString(9, STRINGY(155), 0, va("%3d mph", convSpeed)); + } } void K_drawKartHUD(void)