Made SetPresetName reset scriptPresetName on MO so it correctly clears that with CopyOfs in INI. This is necessary for multiple scripts to properly function.

Made entity ini reading call SetPresetName instead of using the >> operator
Added some multiscript handling safety to ScriptPath ini property in MO

Author: garethyr

Entities/MovableObject.cpp

@@ -330,9 +330,10 @@ int MovableObject::ReadProperty(std::string propName, Reader &reader)
 	}
 	else if (propName == "ScriptPath")
     {
-        reader >> m_ScriptPath;
-        // Read in the Lua script function definitions for this preset
-        LoadScripts(m_ScriptPath);
+        std::string scriptPath = reader.ReadPropValue();
+        if (LoadScript(scriptPath) == -2) {
+            reader.ReportError("Duplicate script path " + scriptPath);
+        }
     }
     else if (propName == "ScreenEffect")
     {

Entities/MovableObject.h

@@ -250,6 +250,12 @@ ENTITYALLOCATION(MovableObject)
 
     virtual const Entity::ClassInfo & GetClass() const { return m_sClass; }
 
+    /// <summary>
+    /// Override SetPresetName so it also resets script paths and script preset name. Note that this'll screw up lua that calls SetPresetName but that probably shouldn't be lua accessible anyway.
+    /// </summary>
+    /// <param name="newName">A string reference with the instance name of this Entity.</param>
+    virtual void SetPresetName(const std::string &newName) override { Entity::SetPresetName(newName); m_ScriptPresetName.clear(); }
+
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Virtual method:   GetClassName

System/Entity.cpp

@@ -65,7 +65,7 @@ namespace RTE {
 				m_DefinedInModule = reader.GetReadModuleID();
 			}
 		} else if (propName == "PresetName" || propName == "InstanceName") {
-			reader >> m_PresetName;
+			SetPresetName(reader.ReadPropValue());
 			// Preset name might have "[ModuleName]/" preceding it, detect it here and select proper module!
 			int slashPos = m_PresetName.find_first_of('/');
 			if (slashPos != std::string::npos) { m_PresetName = m_PresetName.substr(slashPos + 1); }