Remove all occurances of FCVAR_CHEAT

spt/features/autojump.cpp

@@ -16,16 +16,16 @@
 
 AutojumpFeature spt_autojump;
 ConVar y_spt_autojump("y_spt_autojump", "0", FCVAR_ARCHIVE | FCVAR_DEMO);
-ConVar _y_spt_autojump_ensure_legit("_y_spt_autojump_ensure_legit", "1", FCVAR_CHEAT);
+ConVar _y_spt_autojump_ensure_legit("_y_spt_autojump_ensure_legit", "1");
 ConVar y_spt_jumpboost("y_spt_jumpboost",
                        "0",
-                       FCVAR_CHEAT,
+                       FCVAR_NONE,
                        "Enables special game movement mechanic.\n"
                        "0 = Default.\n"
                        "1 = ABH movement mechanic.\n"
                        "2 = OE movement mechanic.\n"
                        "3 = No jumpboost. (multiplayer mode movement)");
-ConVar y_spt_aircontrol("y_spt_aircontrol", "0", FCVAR_CHEAT, "Enables HL2 air control.");
+ConVar y_spt_aircontrol("y_spt_aircontrol", "0", FCVAR_NONE, "Enables HL2 air control.");
 
 namespace patterns
 {

spt/features/camera.cpp

@@ -144,7 +144,7 @@ Camera spt_camera;
 ConVar y_spt_cam_control(
     "y_spt_cam_control",
     "0",
-    FCVAR_CHEAT,
+    FCVAR_NONE,
     "Changes the camera control type.\n"
     "0 = Default\n"
     "1 = Drive mode\n"
@@ -159,7 +159,7 @@ ConVar y_spt_cam_control(
     "    Sets the camera position to an entity. Use spt_cam_drive_ent to set the entity.\n"
     "4 = Trace drive mode\n"
     "    Sets the camera position to the currently active trace");
-ConVar y_spt_cam_drive("y_spt_cam_drive", "1", FCVAR_CHEAT, "Enables or disables camera drive mode in-game.");
+ConVar y_spt_cam_drive("y_spt_cam_drive", "1", FCVAR_NONE, "Enables or disables camera drive mode in-game.");
 ConVar y_spt_cam_drive_speed("y_spt_cam_drive_speed", "200", 0, "Speed for moving in camera drive mode.");
 ConVar y_spt_cam_path_interp("y_spt_cam_path_interp",
                              "1",
@@ -168,7 +168,7 @@ ConVar y_spt_cam_path_interp("y_spt_cam_path_interp",
                              "0 = Linear interpolation\n"
                              "1 = Cubic spline\n"
                              "2 = Piecewise Cubic Hermite Interpolating Polynomial (PCHIP)");
-ConVar y_spt_cam_path_draw("y_spt_cam_path_draw", "0", FCVAR_CHEAT, "Draws the current camera path.");
+ConVar y_spt_cam_path_draw("y_spt_cam_path_draw", "0", FCVAR_NONE, "Draws the current camera path.");
 
 ConVar _y_spt_force_fov("_y_spt_force_fov", "0", 0, "Force FOV to some value.");
 

spt/features/collision_group.cpp

@@ -43,7 +43,7 @@ CollisionGroup spt_collisiongroup;
 
 CON_COMMAND_F(y_spt_set_collision_group,
               "Set player's collision group\nUsually:\n- 5 is normal collisions\n- 10 is quickclip\n",
-              FCVAR_CHEAT)
+              FCVAR_NONE)
 {
 	if (!spt_collisiongroup.ORIG_SetCollisionGroup)
 		return;

spt/features/ent_props.cpp

@@ -20,11 +20,11 @@
 #include <regex>
 
 #ifdef SPT_HUD_ENABLED
-ConVar y_spt_hud_portal_bubble("y_spt_hud_portal_bubble", "0", FCVAR_CHEAT, "Turns on portal bubble index hud.\n");
+ConVar y_spt_hud_portal_bubble("y_spt_hud_portal_bubble", "0", FCVAR_NONE, "Turns on portal bubble index hud.\n");
 ConVar y_spt_hud_ent_info(
     "y_spt_hud_ent_info",
     "",
-    FCVAR_CHEAT,
+    FCVAR_NONE,
     "Display entity info on HUD. Format is \"[ent index],[prop regex],[prop regex],...,[prop regex];[ent index],...,[prop regex]\".\n");
 #endif
 

spt/features/game_fixes/rng.cpp

@@ -14,20 +14,20 @@
 ConVar y_spt_set_ivp_seed_on_load(
     "y_spt_set_ivp_seed_on_load",
     "",
-    FCVAR_CHEAT,
+    FCVAR_NONE,
     "Sets the ivp seed once during the next load, can prevent some physics rng when running a tas.");
 
 ConVar spt_set_physics_hook_offset_on_load(
     "spt_set_physics_hook_offset_on_load",
     "",
-    FCVAR_CHEAT,
+    FCVAR_NONE,
     "Sets the offset of the physics hook timer once during the next load; this may contribute to the uniform random stream.\n"
     "Valid values are integer multiples of the tickrate in [0,0.05f].");
 
 ConVar spt_set_all_sounds_available_after_load(
     "spt_set_all_sounds_available_after_load",
     "0",
-    FCVAR_CHEAT | FCVAR_TAS_RESET,
+    FCVAR_TAS_RESET,
     "Set to 1 for consistent sound rng, which may contribute to the uniform random stream. Useful for new TAS scripts, but may break old scripts.");
 
 RNGStuff spt_rng;

spt/features/game_fixes/snapshot_overflow.cpp

@@ -4,7 +4,7 @@
 
 ConVar spt_prevent_snapshot_overflow("spt_prevent_snapshot_overflow",
                                      "0",
-                                     FCVAR_CHEAT | FCVAR_DONTRECORD,
+                                     FCVAR_DONTRECORD,
                                      "If enabled, tries to prevent the reliable snapshot overflow error.");
 
 namespace patterns

spt/features/game_fixes/vag_crash.cpp

@@ -11,7 +11,7 @@
 ConVar y_spt_prevent_vag_crash(
     "y_spt_prevent_vag_crash",
     "0",
-    FCVAR_CHEAT | FCVAR_DONTRECORD,
+    FCVAR_DONTRECORD,
     "Prevents the game from crashing from too many recursive teleports (useful when searching for vertical angle glitches).\n");
 
 // spt_prevent_vag_crash

spt/features/hops_hud.cpp

@@ -25,12 +25,12 @@
 #undef max
 #undef clamp
 
-ConVar y_spt_jhud_hops("y_spt_jhud_hops", "0", FCVAR_CHEAT, "Turns on the hop practice Jump HUD.");
-ConVar y_spt_jhud_ljstats("y_spt_jhud_ljstats", "0", FCVAR_CHEAT, "Turns on the LJ stats Jump HUD.");
-ConVar y_spt_jhud_velocity("y_spt_jhud_velocity", "0", FCVAR_CHEAT, "Turns on the velocity Jump HUD.");
-ConVar spt_jhud_strafe("spt_jhud_strafe", "0", FCVAR_CHEAT, "Turns on the strafe percentage Jump HUD.");
-ConVar y_spt_jhud_x("y_spt_jhud_x", "0", FCVAR_CHEAT, "Jump HUD x offset.");
-ConVar y_spt_jhud_y("y_spt_jhud_y", "100", FCVAR_CHEAT, "Jump HUD y offset.");
+ConVar y_spt_jhud_hops("y_spt_jhud_hops", "0", FCVAR_NONE, "Turns on the hop practice Jump HUD.");
+ConVar y_spt_jhud_ljstats("y_spt_jhud_ljstats", "0", FCVAR_NONE, "Turns on the LJ stats Jump HUD.");
+ConVar y_spt_jhud_velocity("y_spt_jhud_velocity", "0", FCVAR_NONE, "Turns on the velocity Jump HUD.");
+ConVar spt_jhud_strafe("spt_jhud_strafe", "0", FCVAR_NONE, "Turns on the strafe percentage Jump HUD.");
+ConVar y_spt_jhud_x("y_spt_jhud_x", "0", FCVAR_NONE, "Jump HUD x offset.");
+ConVar y_spt_jhud_y("y_spt_jhud_y", "100", FCVAR_NONE, "Jump HUD y offset.");
 
 namespace ljstats
 {

spt/features/hud.cpp

@@ -18,7 +18,7 @@ extern ConVar _y_spt_overlay;
 HUDFeature spt_hud_feat;
 
 ConVar y_spt_hud("y_spt_hud", "1", 0, "When set to 1, displays SPT HUD.");
-ConVar y_spt_hud_left("y_spt_hud_left", "0", FCVAR_CHEAT, "When set to 1, displays SPT HUD on the left.");
+ConVar y_spt_hud_left("y_spt_hud_left", "0", FCVAR_NONE, "When set to 1, displays SPT HUD on the left.");
 
 const std::string FONT_DefaultFixedOutline = "DefaultFixedOutline";
 const std::string FONT_Trebuchet20 = "Trebuchet20";

spt/features/isg.cpp

@@ -9,7 +9,7 @@
 
 #include "convar.hpp"
 
-ConVar y_spt_hud_isg("y_spt_hud_isg", "0", FCVAR_CHEAT, "Is the ISG flag set?\n");
+ConVar y_spt_hud_isg("y_spt_hud_isg", "0", FCVAR_NONE, "Is the ISG flag set?\n");
 
 namespace patterns
 {
@@ -56,7 +56,7 @@ class ISGFeature : public FeatureWrapper<ISGFeature>
 
 static ISGFeature spt_isg;
 
-CON_COMMAND_F(y_spt_set_isg, "Sets the state of ISG in the game (1 or 0)", FCVAR_DONTRECORD | FCVAR_CHEAT)
+CON_COMMAND_F(y_spt_set_isg, "Sets the state of ISG in the game (1 or 0)", FCVAR_DONTRECORD)
 {
 	if (args.ArgC() < 2)
 	{

spt/features/leafvis.cpp

@@ -11,7 +11,7 @@ namespace patterns
 
 ConVar y_spt_leafvis_index("y_spt_leafvis_index",
                            "0",
-                           FCVAR_CHEAT,
+                           FCVAR_NONE,
                            "Choose which BSP leaf mat_leafvis will use. Requires mat_leafvis to be set\n");
 
 // Enhance mat_leafvis by allowing you to choose the BSP leaf by index

spt/features/movement_vars.cpp

@@ -17,7 +17,7 @@ static ConVar* _sv_maxspeed_cvar = nullptr;
 ConVar spt_player_maxspeed(
     "spt_player_maxspeed",
     "0",
-    FCVAR_DEMO | FCVAR_CHEAT,
+    FCVAR_DEMO,
     "If nonzero, set player maxspeed to this value. When changed also changes cl_forwardspeed/cl_sidespeed/cl_backspeed/sv_maxspeed to match this value.",
     Change_Maxspeed);
 

spt/features/overlay.cpp

@@ -24,11 +24,11 @@
 
 ConVar _y_spt_overlay("_y_spt_overlay",
                       "0",
-                      FCVAR_CHEAT,
+                      FCVAR_NONE,
                       "Enables the overlay camera in the top left of the screen.\n");
 ConVar _y_spt_overlay_type("_y_spt_overlay_type",
                            "0",
-                           FCVAR_CHEAT,
+                           FCVAR_NONE,
                            "Overlay type:\n"
                            "  0 = save glitch body\n"
                            "  1 = angle glitch simulation\n"
@@ -47,54 +47,54 @@ constexpr int SPT_PORTAL_SELECT_FLAGS = GPF_ALLOW_AUTO | GPF_ALLOW_PLAYER_ENV;
 ConVar _y_spt_overlay_portal(
     "_y_spt_overlay_portal",
     "env",
-    FCVAR_CHEAT,
+    FCVAR_NONE,
     "Chooses the portal for the overlay camera. For the SG camera this is the portal you save glitch on, for angle glitch simulation this is the portal you enter. Valid values are:\n"
     "" SPT_PORTAL_SELECT_DESCRIPTION_ENV_PREFIX "" SPT_PORTAL_SELECT_DESCRIPTION_AUTO_PREFIX
     "" SPT_PORTAL_SELECT_DESCRIPTION);
 #endif
 
 ConVar _y_spt_overlay_width("_y_spt_overlay_width",
                             "480",
-                            FCVAR_CHEAT,
+                            FCVAR_NONE,
                             "Determines the width of the overlay. Height is determined automatically from width.\n",
                             true,
                             20.0f,
                             true,
                             3840.0f);
 ConVar _y_spt_overlay_fov("_y_spt_overlay_fov",
                           "90",
-                          FCVAR_CHEAT,
+                          FCVAR_NONE,
                           "Determines the FOV of the overlay.\n",
                           true,
                           1.f,
                           true,
                           175.f);
-ConVar _y_spt_overlay_swap("_y_spt_overlay_swap", "0", FCVAR_CHEAT, "Swap alternate view and main screen?\n");
+ConVar _y_spt_overlay_swap("_y_spt_overlay_swap", "0", FCVAR_NONE, "Swap alternate view and main screen?\n");
 
 #if defined(SPT_HUD_ENABLED) && !defined(SPT_HUD_TEXTONLY)
 ConVar _y_spt_overlay_crosshair_size("_y_spt_overlay_crosshair_size",
                                      "10",
-                                     FCVAR_CHEAT,
+                                     FCVAR_NONE,
                                      "Overlay crosshair size.",
                                      true,
                                      1,
                                      true,
                                      200);
 ConVar _y_spt_overlay_crosshair_thickness("_y_spt_overlay_crosshair_thickness",
                                           "1",
-                                          FCVAR_CHEAT,
+                                          FCVAR_NONE,
                                           "Overlay crosshair thickness.",
                                           true,
                                           1,
                                           true,
                                           15);
 ConVar _y_spt_overlay_crosshair_color("_y_spt_overlay_crosshair_color",
                                       "0 255 0 255",
-                                      FCVAR_CHEAT,
+                                      FCVAR_NONE,
                                       "Overlay crosshair RGBA color.");
 #endif
 
-ConVar _y_spt_overlay_no_roll("_y_spt_overlay_no_roll", "1", FCVAR_CHEAT, "Set the roll of overlay camera roll to 0.");
+ConVar _y_spt_overlay_no_roll("_y_spt_overlay_no_roll", "1", FCVAR_NONE, "Set the roll of overlay camera roll to 0.");
 
 Overlay spt_overlay;
 

spt/features/playerio.cpp

@@ -30,23 +30,23 @@ static void* cinput_thisptr = nullptr;
 
 ConVar spt_hud_position("spt_hud_position",
                         "0",
-                        FCVAR_CHEAT,
+                        FCVAR_NONE,
                         "Turns on the position hud.\n"
                         "=1: eye position\n"
                         ">1: player position with more precision.");
-ConVar spt_hud_angles("spt_hud_angles", "0", FCVAR_CHEAT, "Turns on the angles hud with more precision.");
-ConVar y_spt_hud_accel("y_spt_hud_accel", "0", FCVAR_CHEAT, "Turns on the acceleration hud.");
+ConVar spt_hud_angles("spt_hud_angles", "0", FCVAR_NONE, "Turns on the angles hud with more precision.");
+ConVar y_spt_hud_accel("y_spt_hud_accel", "0", FCVAR_NONE, "Turns on the acceleration hud.");
 ConVar y_spt_hud_ag_sg_tester("y_spt_hud_ag_sg_tester",
                               "0",
-                              FCVAR_CHEAT,
+                              FCVAR_NONE,
                               "Tests if angle glitch will save glitch you.");
-ConVar y_spt_hud_flags("y_spt_hud_flags", "0", FCVAR_CHEAT, "Turns on the flags hud.");
-ConVar y_spt_hud_moveflags("y_spt_hud_moveflags", "0", FCVAR_CHEAT, "Turns on the move type hud.");
-ConVar y_spt_hud_movecollideflags("y_spt_hud_movecollideflags", "0", FCVAR_CHEAT, "Turns on the move collide hud.");
-ConVar y_spt_hud_collisionflags("y_spt_hud_collisionflags", "0", FCVAR_CHEAT, "Turns on the collision group hud.");
-ConVar y_spt_hud_vars("y_spt_hud_vars", "0", FCVAR_CHEAT, "Turns on the movement vars HUD.");
-ConVar y_spt_hud_velocity("y_spt_hud_velocity", "0", FCVAR_CHEAT, "Turns on the velocity hud.");
-ConVar y_spt_hud_velocity_angles("y_spt_hud_velocity_angles", "0", FCVAR_CHEAT, "Display velocity Euler angles.");
+ConVar y_spt_hud_flags("y_spt_hud_flags", "0", FCVAR_NONE, "Turns on the flags hud.");
+ConVar y_spt_hud_moveflags("y_spt_hud_moveflags", "0", FCVAR_NONE, "Turns on the move type hud.");
+ConVar y_spt_hud_movecollideflags("y_spt_hud_movecollideflags", "0", FCVAR_NONE, "Turns on the move collide hud.");
+ConVar y_spt_hud_collisionflags("y_spt_hud_collisionflags", "0", FCVAR_NONE, "Turns on the collision group hud.");
+ConVar y_spt_hud_vars("y_spt_hud_vars", "0", FCVAR_NONE, "Turns on the movement vars HUD.");
+ConVar y_spt_hud_velocity("y_spt_hud_velocity", "0", FCVAR_NONE, "Turns on the velocity hud.");
+ConVar y_spt_hud_velocity_angles("y_spt_hud_velocity_angles", "0", FCVAR_NONE, "Display velocity Euler angles.");
 
 namespace patterns
 {

spt/features/qccmd.cpp

@@ -12,7 +12,7 @@
 
 ConVar spt_qc_cmd("spt_qc_cmd",
                   "",
-                  FCVAR_CHEAT,
+                  FCVAR_NONE,
                   "Execute command when quickclip occurs. "
                   "This is detected by the difference between "
                   "the quake position and the shadow position "
@@ -22,18 +22,18 @@ ConVar spt_qc_cmd("spt_qc_cmd",
 ConVar spt_qc_threshold(
     "spt_qc_threshold",
     "32",
-    FCVAR_CHEAT,
+    FCVAR_NONE,
     "Threshold for quickclip detection, the distance between the quake hitbox and havok hitbox must exceed this before the teleport.\n");
 
 ConVar spt_qc_maxdist_to_prev(
     "spt_qc_maxdist_to_prev",
     "200",
-    FCVAR_CHEAT | FCVAR_HIDDEN,
+    FCVAR_HIDDEN,
     "Max distance to previous shadow position. This is to prevent loading a save with a havok hitbox differential causing the qc command to trigger.\n");
 
 ConVar spt_qc_teleport_eps("spt_qc_teleport_eps",
                            "1",
-                           FCVAR_CHEAT | FCVAR_HIDDEN,
+                           FCVAR_HIDDEN,
                            "Quake hitbox needs to be within this many units to be considered teleported.\n");
 
 // Execute command on quickclip

spt/features/strafehud.cpp

@@ -62,28 +62,28 @@ class StrafeHUD : public FeatureWrapper<StrafeHUD>
 
 static StrafeHUD feat_strafehud;
 
-ConVar spt_strafehud("spt_strafehud", "0", FCVAR_CHEAT, "Draws the strafe HUD.");
-ConVar spt_strafehud_x("spt_strafehud_x", "-10", FCVAR_CHEAT, "The X position for the strafe HUD.");
-ConVar spt_strafehud_y("spt_strafehud_y", "-10", FCVAR_CHEAT, "The Y position for the strafe HUD.");
+ConVar spt_strafehud("spt_strafehud", "0", FCVAR_NONE, "Draws the strafe HUD.");
+ConVar spt_strafehud_x("spt_strafehud_x", "-10", FCVAR_NONE, "The X position for the strafe HUD.");
+ConVar spt_strafehud_y("spt_strafehud_y", "-10", FCVAR_NONE, "The Y position for the strafe HUD.");
 ConVar spt_strafehud_size("spt_strafehud_size",
                           "256",
-                          FCVAR_CHEAT,
+                          FCVAR_NONE,
                           "The width and height of the strafe HUD.",
                           true,
                           1,
                           false,
                           0);
 ConVar spt_strafehud_detail_scale("spt_strafehud_detail_scale",
                                   "4",
-                                  FCVAR_CHEAT,
+                                  FCVAR_NONE,
                                   "The detail scale for the lines of the strafe HUD.",
                                   true,
                                   1,
                                   true,
                                   15);
 ConVar spt_strafehud_lock_mode("spt_strafehud_lock_mode",
                                "1",
-                               FCVAR_CHEAT,
+                               FCVAR_NONE,
                                "Lock mode used by the strafe HUD:\n"
                                "0 - view direction\n"
                                "1 - velocity direction\n"

spt/features/tas.cpp

@@ -146,7 +146,7 @@ ConVar tas_script_printvars("tas_script_printvars",
                             "Prints variable information when running .srctas scripts.\n");
 ConVar tas_script_savestates("tas_script_savestates", "1", 0, "Enables/disables savestates in .srctas scripts.\n");
 ConVar tas_script_onsuccess("tas_script_onsuccess", "", 0, "Commands to be executed when a search concludes.\n");
-ConVar y_spt_hud_script_progress("y_spt_hud_script_progress", "0", FCVAR_CHEAT, "Turns on the script progress hud.\n");
+ConVar y_spt_hud_script_progress("y_spt_hud_script_progress", "0", FCVAR_NONE, "Turns on the script progress hud.\n");
 
 TASFeature spt_tas;
 

spt/features/tracing.cpp

@@ -20,7 +20,7 @@
 #undef min
 #undef max
 
-ConVar y_spt_hud_oob("y_spt_hud_oob", "0", FCVAR_CHEAT, "Is the player OoB?");
+ConVar y_spt_hud_oob("y_spt_hud_oob", "0", FCVAR_NONE, "Is the player OoB?");
 
 Tracing spt_tracing;