Minor fixes - pulled custom value handling in MOSR into a separate method, multi-lined some inline variables

Author: garethyr

Entities/MOSRotating.cpp

@@ -479,30 +479,34 @@ int MOSRotating::ReadProperty(std::string propName, Reader &reader)
 		reader >> m_DamageMultiplier;
 		m_DamageMultiplierRedefined = true;
     } else if (propName == "AddCustomValue") {
-        std::string customValueType, customKey, customValue;
-        reader >> customValueType;
-        customKey = reader.ReadPropName();
-        customValue = reader.ReadPropValue();
-        if (customValueType == "NumberValue") {
-            try {
-                SetNumberValue(customKey, std::stod(customValue));
-            } catch (const std::invalid_argument) {
-                reader.ReportError("Tried to read a non-number value for SetNumberValue.");
-            }
-        } else if (customValueType == "StringValue") {
-            SetStringValue(customKey, customValue);
-        } else {
-            reader.ReportError("Invalid CustomValue type " + customValueType);
-        }
-        // Artificially end reading this property since we got all we needed
-        reader.NextProperty();
+        ReadCustomValueProperty(reader);
     } else
         // See if the base class(es) can find a match instead
         return MOSprite::ReadProperty(propName, reader);
 
     return 0;
 }
 
+void MOSRotating::ReadCustomValueProperty(Reader &reader) {
+    std::string customValueType;
+    reader >> customValueType;
+    std::string customKey = reader.ReadPropName();
+    std::string customValue = reader.ReadPropValue();
+    if (customValueType == "NumberValue") {
+        try {
+            SetNumberValue(customKey, std::stod(customValue));
+        } catch (const std::invalid_argument) {
+            reader.ReportError("Tried to read a non-number value for SetNumberValue.");
+        }
+    } else if (customValueType == "StringValue") {
+        SetStringValue(customKey, customValue);
+    } else {
+        reader.ReportError("Invalid CustomValue type " + customValueType);
+    }
+    // Artificially end reading this property since we got all we needed
+    reader.NextProperty();
+}
+
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Virtual method:  Save

Entities/MOSRotating.h

@@ -1218,6 +1218,12 @@ ENTITYALLOCATION(MOSRotating)
 
     void Clear();
 
+    /// <summary>
+    /// Handles reading for custom values, dealing with the various types of custom values.
+    /// </summary>
+    /// <param name="reader">A Reader lined up to the custom value type to be read.</param>
+    void ReadCustomValueProperty(Reader &reader);
+
 
     // Disallow the use of some implicit methods.
     MOSRotating(const MOSRotating &reference);