Revert "Added saved/loaded values to MovableObject"

Not necessary and better to remove the memory overhead

This reverts commit eece89a.

Author: Causeless

CHANGELOG.md

@@ -66,9 +66,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 	`tracy.Message(text)` to send a tracy message.  
 	Lua scripts without any tracy documentation are still profiled by tracy, however only at a granularity of how long the entire script takes to execute.  
 
-- New `MovableObject` Lua functions `SaveNumber(stringKey, floatValue)`, `LoadNumber(stringKey)`, `SaveString(stringKey, stringValue)` and `SaveString(stringKey)`.  
-	These work in the same manner as the likewise named functions on `Activity`.
-
 - New `HeldDevice` Lua function `IsBeingHeld`, which returns whether or not the `HeldDevice` is currently being held.  
 
 - New `HeldDevice` INI and Lua (R/W) property `GetsHitByMOsWhenHeld`, which defines whether this `HeldDevice` can be hit by MOs while equipped and held by an actor. Defaults to true.  

Entities/MovableObject.cpp

@@ -124,7 +124,6 @@ void MovableObject::Clear()
 
 	m_SimUpdatesBetweenScriptedUpdates = 1;
     m_SimUpdatesSinceLastScriptedUpdate = 0;
-    m_SavedValues.Reset();
 }
 
 LuaStateWrapper & MovableObject::GetAndLockStateForScript(const std::string &scriptPath, const LuaFunction *function) {
@@ -295,8 +294,6 @@ int MovableObject::Create(const MovableObject &reference)
 	m_UniqueID = MovableObject::GetNextUniqueID();
 	g_MovableMan.RegisterObject(this);
 
-    m_SavedValues = reference.m_SavedValues;
-
     return 0;
 }
 
@@ -407,7 +404,6 @@ int MovableObject::ReadProperty(const std::string_view &propName, Reader &reader
 	MatchProperty("IgnoreTerrain", { reader >> m_IgnoreTerrain; });
     MatchProperty("SimUpdatesBetweenScriptedUpdates", { reader >> m_SimUpdatesBetweenScriptedUpdates; });
     MatchProperty("AddCustomValue", { ReadCustomValueProperty(reader); });
-    MatchProperty("GenericSavedValues", { reader >> m_SavedValues; });
 
     EndPropertyList;
 }
@@ -526,9 +522,6 @@ int MovableObject::Save(Writer &writer) const
         writer.NewPropertyWithValue(key, value);
     }
 
-    writer.NewProperty("GenericSavedValues");
-    writer << m_SavedValues;
-
     return 0;
 }
 

Entities/MovableObject.h

@@ -1614,32 +1614,6 @@ enum MOType
     /// <returns>Whether or not there is an associated value for this key.</returns>
     bool ObjectValueExists(const std::string &key) const;
 
-    /// <summary>
-    /// Saves a string which will be stored in our ini.
-    /// </summary>
-    /// <param name="key">The key of the saved string.</param>
-    /// <param name="value">The string to save.</param>
-    void SaveScriptString(const std::string& key, const std::string& value) { m_SavedValues.SaveString(key, value); };
-
-    /// <summary>
-    /// Loads and returns a previously saved string.
-    /// </summary>
-    /// <param name="key">The key of the string to load.</param>
-    const std::string& LoadScriptString(const std::string& key) { return m_SavedValues.LoadString(key); };
-
-    /// <summary>
-    /// Saves a number which will be stored in our ini.
-    /// </summary>
-    /// <param name="key">The key of the saved number.</param>
-    /// <param name="value">The number to save.</param>
-    void SaveScriptNumber(const std::string& key, float value) { m_SavedValues.SaveNumber(key, value); };
-
-    /// <summary>
-    /// Loads and returns a previously saved number.
-    /// </summary>
-    /// <param name="key">The key of the string to load.</param>
-    float LoadScriptNumber(const std::string& key) { return m_SavedValues.LoadNumber(key); };
-
 	/// <summary>
 	/// Event listener to be run while this MovableObject's PieMenu is opened.
 	/// </summary>
@@ -2141,11 +2115,6 @@ enum MOType
     int m_SimUpdatesBetweenScriptedUpdates; //!< The number of Sim updates between each scripted update for this MovableObject.
     int m_SimUpdatesSinceLastScriptedUpdate; //!< The counter for the current number of Sim updates since this MovableObject last ran a scripted update.
 
-    /// <summary>
-    /// Generic additional saved strings/numbers, which are used for scripts primarily.
-    /// </summary>
-    GenericSavedData m_SavedValues;
-
 //////////////////////////////////////////////////////////////////////////////////////////
 // Private member variable and method declarations
 

Lua/LuaBindingsEntities.cpp

@@ -1083,10 +1083,6 @@ namespace RTE {
 		.def("IsAtRest", &MovableObject::IsAtRest)
 		.def("MoveOutOfTerrain", &MovableObject::MoveOutOfTerrain)
 		.def("RotateOffset", &MovableObject::RotateOffset)
-		.def("SaveString", &MovableObject::SaveScriptString)
-		.def("LoadString", &MovableObject::LoadScriptString)
-		.def("SaveNumber", &MovableObject::SaveScriptNumber)
-		.def("LoadNumber", &MovableObject::LoadScriptNumber)
 		.def("SendMessage", &LuaAdaptersMovableObject::SendMessage1)
 		.def("SendMessage", &LuaAdaptersMovableObject::SendMessage2);
 	}