Remove ROTOR_SIMPLE flag

CleverRaven · Jun 28, 2023 · 5489c54 · 5489c54
1 parent 3002351
commit 5489c54
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/src/veh_type.cpp b/src/veh_type.cpp
@@ -100,7 +100,6 @@ static const std::unordered_map<std::string, vpart_bitflags> vpart_bitflag_map =
     { "WALL_MOUNTED", VPFLAG_WALL_MOUNTED },
     { "WHEEL", VPFLAG_WHEEL },
     { "ROTOR", VPFLAG_ROTOR },
-    { "ROTOR_SIMPLE", VPFLAG_ROTOR_SIMPLE },
     { "FLOATS", VPFLAG_FLOATS },
     { "DOME_LIGHT", VPFLAG_DOME_LIGHT },
     { "AISLE_LIGHT", VPFLAG_AISLE_LIGHT },
@@ -369,7 +368,7 @@ void vpart_info::load( const JsonObject &jo, const std::string &src )
         }
     }
 
-    if( has_flag( "ROTOR" ) || has_flag( "ROTOR_SIMPLE" ) ) {
+    if( has_flag( "ROTOR" ) ) {
         if( !rotor_info ) {
             rotor_info.emplace();
         }
@@ -1142,7 +1141,7 @@ float vpart_info::wheel_offroad_rating() const
 
 int vpart_info::rotor_diameter() const
 {
-    if( has_flag( VPFLAG_ROTOR ) || has_flag( VPFLAG_ROTOR_SIMPLE ) ) {
+    if( has_flag( VPFLAG_ROTOR ) ) {
         return rotor_info->rotor_diameter;
     }
     return 0;

diff --git a/src/veh_type.h b/src/veh_type.h
@@ -78,7 +78,6 @@ enum vpart_bitflags : int {
     VPFLAG_WALL_MOUNTED,
     VPFLAG_WHEEL,
     VPFLAG_ROTOR,
-    VPFLAG_ROTOR_SIMPLE,
     VPFLAG_MOUNTABLE,
     VPFLAG_FLOATS,
     VPFLAG_DOME_LIGHT,

diff --git a/src/vehicle.cpp b/src/vehicle.cpp
@@ -3970,7 +3970,6 @@ double vehicle::coeff_air_drag() const
             d_check_max( drag[ col ].panel, pa, pa.info().has_flag( "SOLAR_PANEL" ) );
             d_check_max( drag[ col ].windmill, pa, pa.info().has_flag( "WIND_TURBINE" ) );
             d_check_max( drag[ col ].rotor, pa, pa.info().has_flag( "ROTOR" ) );
-            d_check_max( drag[ col ].rotor, pa, pa.info().has_flag( "ROTOR_SIMPLE" ) );
             d_check_max( drag[ col ].sail, pa, pa.info().has_flag( "WIND_POWERED" ) );
             d_check_max( drag[ col ].exposed, pa, d_exposed( pa ) );
             d_check_min( drag[ col ].last, pa, pa.info().has_flag( "LOW_FINAL_AIR_DRAG" ) ||
@@ -5919,7 +5918,7 @@ void vehicle::refresh( const bool remove_fakes )
         if( vpi.has_flag( VPFLAG_SOLAR_PANEL ) ) {
             solar_panels.push_back( p );
         }
-        if( vpi.has_flag( VPFLAG_ROTOR ) || vpi.has_flag( VPFLAG_ROTOR_SIMPLE ) ) {
+        if( vpi.has_flag( VPFLAG_ROTOR ) ) {
             rotors.push_back( p );
         }
         if( vp.part().is_battery() ) {