Merge pull request CleverRaven#32913 from jbytheway/clang_tidy_misc_r…

…edundant_expression

clang-tidy misc-redundant-expression

.clang-tidy

@@ -38,7 +38,6 @@ readability-*,\
 -cert-msc51-cpp,\
 -misc-definitions-in-headers,\
 -misc-non-private-member-variables-in-classes,\
--misc-redundant-expression,\
 -modernize-avoid-c-arrays,\
 -modernize-deprecated-headers,\
 -modernize-pass-by-value,\

src/overmap.cpp

@@ -1574,6 +1574,7 @@ bool overmap::generate_sub( const int z )
                 ter( p ) = oter_id( "spiral_hub" );
                 add_mon_group( mongroup( mongroup_id( "GROUP_SPIRAL" ), i * 2, j * 2, z, 2, 200 ) );
             } else if( oter_above == "silo" ) {
+                // NOLINTNEXTLINE(misc-redundant-expression)
                 if( rng( 2, 7 ) < abs( z ) || rng( 2, 7 ) < abs( z ) ) {
                     ter( p ) = oter_id( "silo_finale" );
                 } else {

src/savegame.cpp

@@ -1521,7 +1521,7 @@ void game::unserialize_master( std::istream &fin )
 {
     savegame_loading_version = 0;
     chkversion( fin );
-    if( savegame_loading_version != savegame_version && savegame_loading_version < 11 ) {
+    if( savegame_loading_version < 11 ) {
         popup_nowait(
             _( "Cannot find loader for save data in old version %d, attempting to load as current version %d." ),
             savegame_loading_version, savegame_version );

src/vehicle_move.cpp

@@ -1427,7 +1427,7 @@ float map::vehicle_wheel_traction( const vehicle &veh ) const
         }
 
         for( const auto &terrain_mod : veh.part_info( p ).wheel_terrain_mod() ) {
-            if( terrain_mod.second.movecost && terrain_mod.second.movecost > 0 &&
+            if( terrain_mod.second.movecost > 0 &&
                 tr.has_flag( terrain_mod.first ) ) {
                 move_mod = terrain_mod.second.movecost;
                 break;