Changed GetSupportedScriptFunctionNames to preprocessor macros so it's easier to find and use

Author: garethyr

Entities/Actor.h

@@ -72,6 +72,7 @@ class Actor:
 
 // Concrete allocation and cloning definitions
 ENTITYALLOCATION(Actor)
+ADD_SCRIPT_FUNCTION_NAMES(MOSRotating, "UpdateAI")
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -1534,12 +1535,6 @@ ENTITYALLOCATION(Actor)
     // Timer for measuring interval between height checks
     Timer m_FallTimer;
 
-    /// <summary>
-    /// Gets a vector containing the script function names this class supports.
-    /// </summary>
-    /// <returns>A vector containing the script function names this class supports.</returns>
-    virtual const std::vector<std::string> GetSupportedScriptFunctionNames() const override { auto functionNames = MOSRotating::GetSupportedScriptFunctionNames(); functionNames.insert(functionNames.end(), {"UpdateAI"}); return functionNames; }
-
 //////////////////////////////////////////////////////////////////////////////////////////
 // Private member variable and method declarations
 

Entities/Attachable.h

@@ -42,6 +42,7 @@ class Attachable:
 
 // Concrete allocation and cloning definitions
 ENTITYALLOCATION(Attachable)
+ADD_SCRIPT_FUNCTION_NAMES(MOSRotating, "OnAttach", "OnDetach")
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -700,12 +701,6 @@ ENTITYALLOCATION(Attachable)
 	// Whether this attachable currently has terrain collisions enabled while it's attached to a parent.
 	bool m_IsCollidingWithTerrainWhileAttached;
 
-    /// <summary>
-    /// Gets a vector containing the script function names this class supports.
-    /// </summary>
-    /// <returns>A vector containing the script function names this class supports.</returns>
-    virtual const std::vector<std::string> GetSupportedScriptFunctionNames() const override { auto functionNames = MOSRotating::GetSupportedScriptFunctionNames(); functionNames.insert(functionNames.end(), {"OnAttach", "OnDetach"}); return functionNames; }
-
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Private member variable and method declarations

Entities/MovableObject.h

@@ -26,6 +26,19 @@ struct BITMAP;
 namespace RTE
 {
 
+
+#pragma region Global Macro Definitions
+    #define SCRIPT_FUNCTION_NAMES(...) \
+        virtual std::vector<std::string> GetSupportedScriptFunctionNames() const { return {__VA_ARGS__}; }
+
+    #define ADD_SCRIPT_FUNCTION_NAMES(PARENT, ...) \
+        virtual std::vector<std::string> GetSupportedScriptFunctionNames() const override { \
+            std::vector<std::string> functionNames = PARENT::GetSupportedScriptFunctionNames(); \
+            functionNames.insert(functionNames.end(), {__VA_ARGS__}); \
+            return functionNames; \
+        }
+#pragma endregion
+
 struct HitData;
 
 
@@ -46,6 +59,7 @@ friend class LuaMan;
 // Public member variable, method and friend function declarations
 
 public:
+    SCRIPT_FUNCTION_NAMES("Create", "Destroy", "Update", "OnScriptRemoveOrDisable", "OnScriptEnable", "OnPieMenu", "OnCollideWithTerrain", "OnCollideWithMO")
 
 enum MOType
 {
@@ -1778,13 +1792,6 @@ ENTITYALLOCATION(MovableObject)
 // Protected member variable and method declarations
 
 protected:
-
-    /// <summary>
-    /// Gets a vector containing the script function names this class supports.
-    /// </summary>
-    /// <returns>A vector containing the script function names this class supports.</returns>
-    virtual const std::vector<std::string> GetSupportedScriptFunctionNames() const { return std::vector<std::string> {"Create", "Destroy", "Update", "OnScriptRemoveOrDisable", "OnScriptEnable", "OnPieMenu", "OnCollideWithTerrain", "OnCollideWithMO"}; }
-
     /// <summary>
     /// Does necessary work to setup a script object name for this object, allowing it to be accessed in Lua, then runs all of the MO's scripts' Create functions in Lua.
     /// </summary>

cpp.hint

@@ -5,3 +5,5 @@
 #define CLASSINFOGETTERS const Entity::ClassInfo & GetClass() const { return m_sClass; } const std::string & GetClassName() const { return m_sClass.GetName(); }
 #define ABSTRACTCLASSINFO(TYPE, PARENT) Entity::ClassInfo TYPE::m_sClass(#TYPE, &PARENT::m_sClass);
 #define CONCRETECLASSINFO(TYPE, PARENT, BLOCKCOUNT) Entity::ClassInfo TYPE::m_sClass(#TYPE, &PARENT::m_sClass, TYPE::Allocate, TYPE::Deallocate, TYPE::NewInstance, BLOCKCOUNT);
+#define SCRIPT_FUNCTION_NAMES(...) virtual std::vector<std::string> GetSupportedScriptFunctionNames() const { return {__VA_ARGS__}; }
+#define ADD_SCRIPT_FUNCTION_NAMES(PARENT, ...) virtual std::vector<std::string> GetSupportedScriptFunctionNames() const override { std::vector<std::string> functionNames = PARENT::GetSupportedScriptFunctionNames(); functionNames.insert(functionNames.end(), {__VA_ARGS__}); return functionNames; }