Apply suggestions from code review

Co-Authored-By: Jianxiang Wang (王健翔) <qrox@sina.com>
CleverRaven · Apr 2, 2020 · 1896fba · 1896fba
1 parent 13e680a
commit 1896fba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/mutation.cpp b/src/mutation.cpp
@@ -1445,10 +1445,10 @@ void test_crossing_threshold( Character &guy, const mutation_category_trait &m_c
     }
 }
 
-bool are_conflicting_traits( const trait_id &trait_1, const trait_id &trait_2 )
+bool are_conflicting_traits( const trait_id &trait_a, const trait_id &trait_b )
 {
-    return ( are_opposite_traits( trait_1, trait_2 ) || b_is_lower_trait_of_a( trait_1, trait_2 )
-             || b_is_higher_trait_of_a( trait_1, trait_2 ) || are_same_type_traits( trait_1, trait_2 ) );
+    return ( are_opposite_traits( trait_a, trait_b ) || b_is_lower_trait_of_a( trait_a, trait_b )
+             || b_is_higher_trait_of_a( trait_a, trait_b ) || are_same_type_traits( trait_a, trait_b ) );
 }
 
 bool are_opposite_traits( const trait_id &trait_a, const trait_id &trait_b )

diff --git a/src/player.cpp b/src/player.cpp
@@ -3370,8 +3370,7 @@ bool character_martial_arts::pick_style( const avatar &you ) // Style selection
 
     uilist kmenu;
     kmenu.text = colorize( string_format( _( "Select a style.  "
-                                          "Press [%s] for more info." ),
-                                          "Press <color_yellow>%s</color> for more info.",
+                                          "Press <color_yellow>%s</color> for more info." ),
                                           ctxt.get_desc( "SHOW_DESCRIPTION" ) ), c_white );
     ma_style_callback callback( static_cast<size_t>( STYLE_OFFSET ), selectable_styles );
     kmenu.callback = &callback;