Merge pull request #34612 from Qrox/fix-clang-tidy-errors

Fix clang-tidy errors and astyle regression
CleverRaven · Oct 10, 2019 · 311109a · 311109a
2 parents 73ac0e3 + e2983e2
commit 311109a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/bonuses.cpp b/src/bonuses.cpp
@@ -229,12 +229,12 @@ std::string bonus_container::get_description() const
         for( const auto &sf : boni.second ) {
             if( sf.stat ) {
                 //~ %1$s: bonus name, %2$d: bonus percentage, %3$s: stat name
-                dump << string_format( "* %1$s: <stat>%2$d%%</stat> of %3$s", type,
-                                       static_cast<int>( sf.scale * 100 ), string_from_scaling_stat( sf.stat ) );
+                dump << string_format( pgettext( "martial art bonus", "* %1$s: <stat>%2$d%%</stat> of %3$s" ),
+                                       type, static_cast<int>( sf.scale * 100 ), string_from_scaling_stat( sf.stat ) );
             } else {
                 //~ %1$s: bonus name, %2$d: bonus percentage
-                dump << string_format( "* %1$s: <stat>%2$d%%</stat>", type,
-                                       static_cast<int>( sf.scale * 100 ) );
+                dump << string_format( pgettext( "martial art bonus", "* %1$s: <stat>%2$d%%</stat>" ),
+                                       type, static_cast<int>( sf.scale * 100 ) );
             }
             dump << std::endl;
         }
@@ -252,12 +252,12 @@ std::string bonus_container::get_description() const
         for( const auto &sf : boni.second ) {
             if( sf.stat ) {
                 //~ %1$s: bonus name, %2$+d: bonus percentage, %3$s: stat name
-                dump << string_format( "* %1$s: <stat>%2$+d%%</stat> of %3$s", type,
-                                       static_cast<int>( sf.scale * 100 ), string_from_scaling_stat( sf.stat ) );
+                dump << string_format( pgettext( "martial art bonus", "* %1$s: <stat>%2$+d%%</stat> of %3$s" ),
+                                       type, static_cast<int>( sf.scale * 100 ), string_from_scaling_stat( sf.stat ) );
             } else {
                 //~ %1$s: bonus name, %2$+d: bonus value
-                dump << string_format( "* %1$s: <stat>%2$+d</stat>", type,
-                                       static_cast<int>( sf.scale ) );
+                dump << string_format( pgettext( "martial art bonus", "* %1$s: <stat>%2$+d</stat>" ),
+                                       type, static_cast<int>( sf.scale ) );
             }
             dump << std::endl;
         }

diff --git a/src/faction_camp.cpp b/src/faction_camp.cpp
@@ -388,7 +388,7 @@ std::vector<tripoint> om_companion_path( const tripoint &start, int range_start
 time_duration companion_travel_time_calc( const tripoint &omt_pos, const tripoint &omt_tgt,
         time_duration work, int trips = 1, int haulage = 0 );
 time_duration companion_travel_time_calc( const std::vector<tripoint> &journey, time_duration work,
-        int trips = 1, int haulauge = 0 );
+        int trips = 1, int haulage = 0 );
 /// Determines how many round trips a given NPC @ref comp will take to move all of the
 /// items @ref itms
 int om_carry_weight_to_trips( const std::vector<item *> &itms, npc_ptr comp = nullptr );

diff --git a/src/player.h b/src/player.h
@@ -398,7 +398,7 @@ class player : public Character
         /** Returns the distance the player can see through walls */
         int  clairvoyance() const;
         /** Returns true if the player has some form of impaired sight */
-        bool sight_impaired() const;        
+        bool sight_impaired() const;
         /** Calculates melee weapon wear-and-tear through use, returns true if item is destroyed. */
         bool handle_melee_wear( item &shield, float wear_multiplier = 1.0f );
         /** True if unarmed or wielding a weapon with the UNARMED_WEAPON flag */