Cleaned up utils::apply_modifier a bit

wesnoth · May 28, 2018 · c5ba6f0 · c5ba6f0
1 parent 0ca8227
commit c5ba6f0
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/src/serialization/string_utils.cpp b/src/serialization/string_utils.cpp
@@ -412,18 +412,25 @@ std::pair<string_view, string_view> vertical_split(const std::string& val)
 }
 
 // Modify a number by string representing integer difference, or optionally %
-int apply_modifier( const int number, const std::string &amount, const int minimum ) {
-	// wassert( amount.empty() == false );
+int apply_modifier(const int number, const std::string& amount, const int minimum)
+{
 	int value = 0;
+
 	try {
 		value = std::stoi(amount);
-	} catch(const std::invalid_argument&) {}
-	if(amount[amount.size()-1] == '%') {
+	} catch(const std::invalid_argument&) {
+	}
+
+	if(amount.back() == '%') {
 		value = div100rounded(number * value);
 	}
+
 	value += number;
-	if (( minimum > 0 ) && ( value < minimum ))
-	    value = minimum;
+
+	if(minimum > 0 && value < minimum) {
+		value = minimum;
+	}
+
 	return value;
 }