diff --git a/src/d_netcmd.c b/src/d_netcmd.c index e9d9f5f8c..9c2aa282a 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -917,10 +917,6 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_timetic); CV_RegisterVar(&cv_itemfinder); - // Has to be added here instead of K_RegisterKartStuff because it needs - // Color_cons_t - CV_RegisterVar(&cv_colorizedhudcolor); - // time attack ghost options are also saved to config CV_RegisterVar(&cv_ghost_besttime); CV_RegisterVar(&cv_ghost_bestlap); diff --git a/src/k_kart.c b/src/k_kart.c index bbc14b82e..073f21615 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -63,7 +63,9 @@ consvar_t cv_saltysquish = {"hardcodehopsquish", "On", CV_SAVE, CV_OnOff, NULL, //Colourized HUD consvar_t cv_colorizedhud = {"colorizedhud", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_colorizedhudcolor = {"colorizedhudcolor", "None", CV_SAVE, Color_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; + +static CV_PossibleValue_t HudColor_cons_t[MAXSKINCOLORS+1]; +consvar_t cv_colorizedhudcolor = {"colorizedhudcolor", "Skin Color", CV_SAVE, HudColor_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; // SOME IMPORTANT VARIABLES DEFINED IN DOOMDEF.H: @@ -592,6 +594,17 @@ UINT8 K_GetHudColor() void K_RegisterKartStuff(void) { + HudColor_cons_t[0].value = 0; + HudColor_cons_t[0].strvalue = "Skin Color"; + + for (INT32 i = 1; i < MAXSKINCOLORS; i++) + { + HudColor_cons_t[i].value = i; + HudColor_cons_t[i].strvalue = KartColor_Names[i]; // SRB2kart + } + HudColor_cons_t[MAXSKINCOLORS].value = 0; + HudColor_cons_t[MAXSKINCOLORS].strvalue = NULL; + CV_RegisterVar(&cv_sneaker); CV_RegisterVar(&cv_rocketsneaker); CV_RegisterVar(&cv_invincibility); @@ -670,6 +683,7 @@ void K_RegisterKartStuff(void) //Colourized HUD CV_RegisterVar(&cv_colorizedhud); + CV_RegisterVar(&cv_colorizedhudcolor); CV_RegisterVar(&cv_slamsound);