diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 9d55e76ca..ef8d5856b 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -912,6 +912,7 @@ void D_RegisterClientCommands(void) #ifdef SEENAMES CV_RegisterVar(&cv_seenames); #endif + CV_RegisterVar(&cv_rollingdemos); CV_RegisterVar(&cv_netstat); CV_RegisterVar(&cv_netticbuffer); @@ -933,7 +934,7 @@ void D_RegisterClientCommands(void) COM_AddCommand("displayplayer", Command_Displayplayer_f); - // m_menu.c + // hu_stuff.c //CV_RegisterVar(&cv_compactscoreboard); CV_RegisterVar(&cv_chatheight); CV_RegisterVar(&cv_chatwidth); @@ -943,7 +944,6 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_chatnotifications); CV_RegisterVar(&cv_chatbacktint); CV_RegisterVar(&cv_songcredits); - CV_RegisterVar(&cv_showfreeplay); CV_RegisterVar(&cv_growmusic); CV_RegisterVar(&cv_supermusic); diff --git a/src/g_game.c b/src/g_game.c index 38f063f62..f710b970a 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -421,9 +421,6 @@ consvar_t cv_pauseifunfocused = {"pauseifunfocused", "Yes", CV_SAVE, CV_YesNo, N // Display song credits consvar_t cv_songcredits = {"songcredits", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; -// Show "FREE PLAY" when you're alone. :( -consvar_t cv_showfreeplay = { "showfreeplay", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; - // We can disable special tunes! consvar_t cv_growmusic = {"growmusic", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_supermusic = {"supermusic", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -502,9 +499,6 @@ static CV_PossibleValue_t stretchfactor_t[] = { {3*FRACUNIT/4, "0.750"}, {7*FRACUNIT/8, "0.875"}, {FRACUNIT, "Max"}, {0, NULL}}; consvar_t cv_gravstretch = {"gravstretch", "0", CV_SAVE, stretchfactor_t, NULL, 0, NULL, NULL, 0, 0, NULL}; -static CV_PossibleValue_t slamsound_t[] = {{0, "Off"}, {1, "On"}, {0, NULL}}; -consvar_t cv_slamsound = {"slamsound", "1", CV_SAVE, slamsound_t, NULL, 0, NULL, NULL, 0, 0, NULL}; - static CV_PossibleValue_t sloperolldist_cons_t[] = { /*{256, "256"},*/ {512, "512"}, {768, "768"}, {1024, "1024"}, {1536, "1536"}, {2048, "2048"}, diff --git a/src/g_game.h b/src/g_game.h index a57468a2e..2100a9dd1 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -112,7 +112,7 @@ extern INT16 rw_maximums[NUM_WEAPONS]; // used in game menu extern consvar_t cv_chatwidth, cv_chatnotifications, cv_chatheight, cv_chattime, cv_consolechat, cv_chatbacktint, cv_chatspamprotection/*, cv_compactscoreboard*/; extern consvar_t cv_songcredits; -extern consvar_t cv_showfreeplay; + extern consvar_t cv_growmusic, cv_supermusic; extern consvar_t cv_pauseifunfocused; //extern consvar_t cv_crosshair, cv_crosshair2, cv_crosshair3, cv_crosshair4; @@ -126,6 +126,18 @@ extern consvar_t cv_turnaxis3,cv_moveaxis3,cv_brakeaxis3,cv_aimaxis3,cv_lookaxis extern consvar_t cv_turnaxis4,cv_moveaxis4,cv_brakeaxis4,cv_aimaxis4,cv_lookaxis4,cv_fireaxis4,cv_driftaxis4,cv_lookbackaxis4,cv_xdeadzone4,cv_ydeadzone4; extern consvar_t cv_ghost_besttime, cv_ghost_bestlap, cv_ghost_last, cv_ghost_guest, cv_ghost_staff; +extern consvar_t cv_driftsparkpulse; + +// Sprite Rotation stuff +extern consvar_t cv_gravstretch; +extern consvar_t cv_sloperoll; +extern consvar_t cv_spriteroll; +extern consvar_t cv_sliptideroll; +extern consvar_t cv_sloperolldist; +extern consvar_t cv_sparkroll; + +extern consvar_t cv_cechotoggle; + // Hud offsets #define DECL_HUD_OFFSET_X(name)\ extern consvar_t cv_##name##_xoffset; @@ -154,24 +166,6 @@ DECL_HUD_OFFSET(stat); // Stats #undef DECL_HUD_OFFSET_X #undef DECL_HUD_OFFSET_Y -extern consvar_t cv_showinput; -extern consvar_t cv_newspeedometer; - -extern consvar_t cv_saltyhop; -extern consvar_t cv_saltyhopsfx; -extern consvar_t cv_saltysquish; - -extern consvar_t cv_driftsparkpulse; -extern consvar_t cv_gravstretch; -extern consvar_t cv_sloperoll; -extern consvar_t cv_spriteroll; -extern consvar_t cv_sliptideroll; -extern consvar_t cv_slamsound; -extern consvar_t cv_sloperolldist; -extern consvar_t cv_sparkroll; - -extern consvar_t cv_cechotoggle; - #ifndef NONET extern consvar_t cv_chatlogsize; #endif diff --git a/src/k_kart.c b/src/k_kart.c index a79e5fee1..33bded093 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -65,6 +65,8 @@ consvar_t cv_saltyhop = {"hardcodehop", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, consvar_t cv_saltyhopsfx = {"hardcodehopsfx", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_saltysquish = {"hardcodehopsquish", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_slamsound = {"slamsound", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; + //Colourized HUD consvar_t cv_colorizedhud = {"colorizedhud", "Off", CV_SAVE|CV_CALL, CV_OnOff, Saturn_menu_Onchange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_colorizeditembox = {"colorizeditembox", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -78,6 +80,9 @@ consvar_t cv_darkitembox = {"darkitembox", "On", CV_SAVE, CV_OnOff, NULL, 0, NUL consvar_t cv_biglaps = {"biglaphud", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; //here for ppl who dont want to make 2 more patches for their custom hud +// Show "FREE PLAY" when you're alone. :( +consvar_t cv_showfreeplay = {"showfreeplay", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; + // SOME IMPORTANT VARIABLES DEFINED IN DOOMDEF.H: // gamespeed is cc (0 for easy, 1 for normal, 2 for hard) // franticitems is Frantic Mode items, bool @@ -712,6 +717,8 @@ void K_RegisterKartStuff(void) CV_RegisterVar(&cv_colorizeditembox); CV_RegisterVar(&cv_darkitembox); + + CV_RegisterVar(&cv_showfreeplay); CV_RegisterVar(&cv_biglaps); diff --git a/src/k_kart.h b/src/k_kart.h index 803594790..1af4b8403 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -21,15 +21,23 @@ UINT8 K_GetHudColor(void); void K_RegisterKartStuff(void); -extern consvar_t cv_colorizedhud; -extern consvar_t cv_colorizeditembox; -extern consvar_t cv_colorizedhudcolor; +extern consvar_t cv_showinput; +extern consvar_t cv_newspeedometer; extern consvar_t cv_darkitembox; extern consvar_t cv_biglaps; extern consvar_t cv_highresportrait; -extern consvar_t cv_stat_xoffset; -extern consvar_t cv_stat_yoffset; extern consvar_t cv_showstats; +extern consvar_t cv_showfreeplay; + +extern consvar_t cv_colorizedhud; +extern consvar_t cv_colorizeditembox; +extern consvar_t cv_colorizedhudcolor; + +extern consvar_t cv_saltyhop; +extern consvar_t cv_saltyhopsfx; +extern consvar_t cv_saltysquish; +extern consvar_t cv_slamsound; + boolean K_IsPlayerLosing(player_t *player); boolean K_IsPlayerWanted(player_t *player);