Merge pull request #37053 from CleverRaven/clang-2020-01-14

Appease clang (2020-01-14)
CleverRaven · Jan 15, 2020 · cd00378 · cd00378
2 parents 2612575 + 9577417
commit cd00378
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/src/creature.cpp b/src/creature.cpp
@@ -683,10 +683,10 @@ void Creature::deal_projectile_attack( Creature *source, dealt_projectile_attack
         // if its a tameable animal, its a good way to catch them if they are running away, like them ranchers do!
         // we assume immediate success, then certain monster types immediately break free in monster.cpp move_effects()
         if( z ) {
-            if( !proj.get_drop().is_null() ) {
+            const item &drop_item = proj.get_drop();
+            if( !drop_item.is_null() ) {
                 z->add_effect( effect_tied, 1_turns, num_bp, true );
-                item drop_item = proj.get_drop();
-                z->tied_item = cata::make_value<item>( proj.get_drop() );
+                z->tied_item = cata::make_value<item>( drop_item );
             } else {
                 add_msg( m_debug, "projectile with TANGLE effect, but no drop item specified" );
             }

diff --git a/tests/vehicle_efficiency_test.cpp b/tests/vehicle_efficiency_test.cpp
@@ -429,22 +429,23 @@ TEST_CASE( "vehicle_make_efficiency_case", "[.]" )
 // Fix test for electric vehicles
 TEST_CASE( "vehicle_efficiency", "[vehicle] [engine]" )
 {
-    test_vehicle( "beetle", 745101, 297500, 244600, 80500, 61460 );
-    test_vehicle( "car", 1050050, 527300, 316200, 48620, 29740 );
-    test_vehicle( "car_sports", 1083646, 456200, 324100, 39880, 24620 );
+    test_vehicle( "beetle", 745101, 282500, 234300, 79040, 60450 );
+    test_vehicle( "car", 1050050, 481900, 300300, 47840, 29270 );
+    test_vehicle( "car_sports", 1083646, 368200, 277000, 38890, 24210 );
     test_vehicle( "electric_car", 1055519, 217800, 126500, 18350, 9710 );
-    test_vehicle( "suv", 1249718, 998800, 504800, 74270, 35420 );
-    test_vehicle( "motorcycle", 163085, 77300, 63120, 47530, 39030 );
-    test_vehicle( "quad_bike", 265345, 75950, 75950, 35190, 35190 );
-    test_vehicle( "scooter", 62587, 266900, 258300, 195200, 184400 );
-    test_vehicle( "superbike", 242085, 72120, 46820, 34580, 21610 );
-    test_vehicle( "ambulance", 1751089, 435300, 360400, 66500, 51380 );
-    test_vehicle( "fire_engine", 2540401, 1174000, 982200, 248500, 219000 );
-    test_vehicle( "fire_truck", 6226393, 308500, 201900, 19950, 4747 );
-    test_vehicle( "truck_swat", 5959334, 505800, 348000, 30060, 7719 );
-    test_vehicle( "tractor_plow", 723658, 528000, 528000, 117000, 117000 );
-    test_vehicle( "apc", 5801619, 1100000, 948300, 132800, 86880 );
-    test_vehicle( "humvee", 5503245, 607600, 340900, 25880, 9263 );
-    test_vehicle( "road_roller", 8705726, 363400, 418100, 22990, 6996 );
+    test_vehicle( "suv", 1249718, 916900, 483000, 73470, 35080 );
+    test_vehicle( "motorcycle", 163085, 74030, 61180, 46200, 38100 );
+    test_vehicle( "quad_bike", 265345, 73170, 73170, 34300, 34300 );
+    test_vehicle( "scooter", 62587, 228800, 216400, 170200, 161900 );
+    test_vehicle( "superbike", 242085, 68580, 45170, 33670, 21220 );
+    test_vehicle( "ambulance", 1751089, 410800, 342700, 65630, 50810 );
+    test_vehicle( "fire_engine", 2540401, 1140000, 958700, 246000, 216800 );
+    test_vehicle( "fire_truck", 6226393, 295400, 188800, 19750, 4700 );
+    test_vehicle( "truck_swat", 5959334, 483800, 322700, 29610, 7604 );
+    test_vehicle( "tractor_plow", 723658, 482400, 482400, 113900, 113900 );
+    test_vehicle( "apc", 5801619, 1069000, 922400, 130800, 85590 );
+    test_vehicle( "humvee", 5503245, 574300, 325900, 25620, 9171 );
+    test_vehicle( "road_roller", 8705726, 351200, 385800, 22760, 6925 );
     test_vehicle( "golf_cart", 444630, 52460, 105500, 27250, 14200 );
+
 }