From eadd7381eb0c0a6a0ab2e454ee1c2f6ef490bc47 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Wed, 30 May 2018 17:29:40 -0400 Subject: [PATCH] Changing from Relaxed Standard Turbo to the typical Easy Normal Hard Reception to the naming convention has been either "don't care" or "too hard to remember" --- src/command.c | 2 +- src/d_netcmd.c | 2 +- src/g_game.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/command.c b/src/command.c index 89d09b35..a1f0a46b 100644 --- a/src/command.c +++ b/src/command.c @@ -67,7 +67,7 @@ CV_PossibleValue_t karthud_cons_t[] = { {0, "Off"}, {1, "Default"}, {2, "SNES"}, {3, "MK64"}, {0, NULL}}; CV_PossibleValue_t kartspeed_cons_t[] = { - {0, "Relaxed"}, {1, "Standard"}, {2, "Turbo"}, + {0, "Easy"}, {1, "Normal"}, {2, "Hard"}, {0, NULL}}; #define COM_BUF_SIZE 8192 // command buffer size diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 651e0cfb..231ab8ce 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -357,7 +357,7 @@ consvar_t cv_kartminimap = {"kartminimap", "4", CV_SAVE, kartminimap_cons_t, NUL consvar_t cv_kartcheck = {"kartcheck", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; static CV_PossibleValue_t kartstarsfx_cons_t[] = {{0, "Music"}, {1, "SMK"}, {0, NULL}}; consvar_t cv_kartstarsfx = {"kartstarsfx", "SMK", CV_SAVE, kartstarsfx_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_kartspeed = {"kartspeed", "Standard", CV_NETVAR|CV_CALL|CV_NOINIT, kartspeed_cons_t, KartSpeed_OnChange, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_kartspeed = {"kartspeed", "Normal", CV_NETVAR|CV_CALL|CV_NOINIT, kartspeed_cons_t, KartSpeed_OnChange, 0, NULL, NULL, 0, 0, NULL}; static CV_PossibleValue_t kartballoons_cons_t[] = {{1, "MIN"}, {12, "MAX"}, {0, NULL}}; consvar_t cv_kartballoons = {"kartballoons", "3", CV_NETVAR|CV_CHEAT, kartballoons_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_kartfrantic = {"kartfrantic", "Off", CV_NETVAR|CV_CHEAT|CV_CALL|CV_NOINIT, CV_OnOff, KartFrantic_OnChange, 0, NULL, NULL, 0, 0, NULL}; diff --git a/src/g_game.c b/src/g_game.c index 80671c51..cdde5d50 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -242,7 +242,7 @@ INT32 cheats; //for multiplayer cheat commands // SRB2Kart // Cvars that we don't want changed mid-game -UINT8 gamespeed; // Game's current speed (or difficulty, or cc, or etc); 0-2 for relaxed, standard, & turbo +UINT8 gamespeed; // Game's current speed (or difficulty, or cc, or etc); 0 for easy, 1 for normal, 2 for hard boolean mirrormode; // Mirror Mode currently enabled? boolean franticitems; // Frantic items currently enabled? boolean comeback; // Battle Mode's karma comeback is on/off