Remove overspeeding

Author: gtaylor

CMakeLists.txt

@@ -43,7 +43,6 @@ option(BTECH_CARGO_COMMANDS "Enable hardcoded cargo commands" ON)
 option(BTECH_MW3STATS "Enable MW3-like stats and skills" ON)
 option(BTECH_MOVEMENT_MODES "Enable advanced movement modes" ON)
 option(BTECH_SCALED_INFRARED "Scale infrared BTH with increasing heat" ON)
-option(BTECH_OVERSPEEDING "Allow mech overspeeding" OFF)
 
 option(BTECH_ENABLE_ASAN "Build with AddressSanitizer instrumentation" ON)
 option(BTECH_ENABLE_UBSAN "Build with UndefinedBehaviorSanitizer instrumentation" ON)
@@ -166,7 +165,6 @@ set(BT_CARGO_COMMANDS ${BTECH_CARGO_COMMANDS})
 set(BT_EXILE_MW3STATS ${BTECH_MW3STATS})
 set(BT_MOVEMENT_MODES ${BTECH_MOVEMENT_MODES})
 set(BT_SCALED_INFRARED ${BTECH_SCALED_INFRARED})
-set(WEIGHT_OVERSPEEDING ${BTECH_OVERSPEEDING})
 
 configure_file(src/cmake/btmux_build_config.h.in
                "${BTECH_SOURCE_DIR}/btmux_build_config.h")

TODO

@@ -2,6 +2,7 @@
 
 ## MUX Todos in the /src/ dir
 
+* Can we get rid of mymath.h in favor of standards?
 * Edit attributes from @examine via OSC8 and prepare:?
 * Consolidate the various logging files in server
 * Remove arbitrary logs compile directive and keep it on
@@ -30,4 +31,7 @@
 ## BTech Todos in the /btech/ dir
 
 * Break commodities out of hcode?
-* What is CharacterXpRanking?
+* What is CharacterXpRanking?
+* Add `-fhardened` to CMake for mux and btech. May require disabling debug builds.
+* remove MechRuntimeState.unused
+* Replace CVS headers

src/btech/movement/mech_move.c

@@ -514,22 +514,13 @@ float mech_cargo_maximum_speed(Mech *mech, float mspeed) {
     if (3 * sv < (mech_cached_lugged_weight(mech) + mv))
       mspeed = 0.0F;
     else {
-#ifdef WEIGHT_OVERSPEEDING
-      mspeed = mech_maximum_speed(mech) * mech_tonnage(mech) * 1024.0 /
-               mech_movement_maximum_int(
-                   1024 * mech_real_tonnage(mech) +
-                       mech_cached_lugged_weight(mech) / 3,
-                   (mech_movement_maximum_int(
-                       1024, mv + mech_cached_lugged_weight(mech))));
-#else
       int const tonnage = mech_tonnage(mech);
       int const denominator = mech_movement_maximum_int(
           1024 * tonnage + mech_cached_lugged_weight(mech) / 3,
           mech_movement_maximum_int(1024,
                                     mv + mech_cached_lugged_weight(mech)));
       mspeed = mech_maximum_speed(mech) * (float)tonnage * 1024.0F /
                (float)denominator;
-#endif /* WEIGHT_OVERSPEEDING */
     }
   }
   int const speed_in_movement_points = clamp_float_to_int(mspeed / MP1);

src/cmake/btmux_build_config.h.in

@@ -9,7 +9,6 @@
 #cmakedefine BT_FREETECHTIME 1
 #cmakedefine BT_MOVEMENT_MODES 1
 #cmakedefine BT_SCALED_INFRARED 1
-#cmakedefine WEIGHT_OVERSPEEDING 1
 
 #define BTMUX_NAME "@BTMUX_NAME@"
 #define BTMUX_VERSION_STRING "@BTMUX_VERSION_STRING@"