cleanup

CleverRaven · Feb 16, 2022 · b8eba2d · b8eba2d
1 parent 73637d6
commit b8eba2d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/condition.cpp b/src/condition.cpp
@@ -1075,7 +1075,8 @@ static tripoint get_tripoint_from_string( std::string type, T &d )
 template<class T>
 void conditional_t<T>::set_compare_string( const JsonObject &jo, const std::string &member )
 {
-    str_or_var first, second;
+    str_or_var first;
+    str_or_var second;
     JsonArray objects = jo.get_array( member );
     if( objects.size() != 2 ) {
         jo.throw_error( "incorrect number of values.  Expected 2 in " + jo.str() );

diff --git a/src/debug_menu.cpp b/src/debug_menu.cpp
@@ -1877,8 +1877,10 @@ static void character_edit_menu()
             break;
         }
         case D_EDIT_VARS: {
-            std::string key, value;
-            string_input_popup popup_key, popup_val;
+            std::string key;
+            std::string value;
+            string_input_popup popup_key;
+            string_input_popup popup_val;
             popup_key
             .title( _( "Key" ) )
             .width( 85 )
@@ -2918,8 +2920,10 @@ void debug()
         break;
 
         case debug_menu_index::EDIT_GLOBAL_VARS: {
-            std::string key, value;
-            string_input_popup popup_key, popup_val;
+            std::string key;
+            std::string value;
+            string_input_popup popup_key;
+            string_input_popup popup_val;
             popup_key
             .title( _( "Key" ) )
             .width( 85 )

diff --git a/src/npctalk.cpp b/src/npctalk.cpp
@@ -1616,7 +1616,7 @@ void parse_tags( std::string &phrase, const Character &u, const Character &me,
     } while( fa != std::string::npos && fb != std::string::npos );
 }
 
-void parse_var_tags( std::string &phrase, const dialogue &d )
+static void parse_var_tags( std::string &phrase, const dialogue &d )
 {
     size_t fa;
     size_t fb;