Refactoring

maximegmd · Nov 28, 2021 · b483e48 · b483e48
1 parent ffea536
commit b483e48
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 16 deletions.
diff --git a/src/scripting/Scripting.cpp b/src/scripting/Scripting.cpp
@@ -658,18 +658,6 @@ sol::object Scripting::Index(const std::string& acName, sol::this_state aState,
         return itor->second;
     }
 
-    return InternalIndex(acName, aState, aEnv);
-}
-
-sol::object Scripting::InternalNewIndex(const std::string& acName, sol::object aParam)
-{
-    auto& property = m_properties[acName];
-    property = std::move(aParam);
-    return property;
-}
-
-sol::protected_function Scripting::InternalIndex(const std::string& acName, sol::this_state aState, sol::this_environment aEnv)
-{
     auto func = RTTIHelper::Get().ResolveFunction(acName);
 
     if (!func)
@@ -690,7 +678,9 @@ sol::protected_function Scripting::InternalIndex(const std::string& acName, sol:
         return sol::nil;
     }
 
-    return InternalNewIndex(acName, std::move(func));
+    auto& property = m_properties[acName];
+    property = std::move(func);
+    return property;
 }
 
 sol::object Scripting::GetSingletonHandle(const std::string& acName, sol::this_environment aThisEnv)

diff --git a/src/scripting/Scripting.h b/src/scripting/Scripting.h
@@ -45,10 +45,7 @@ struct Scripting
     void RegisterOverrides();
 
     sol::object Index(const std::string& acName, sol::this_state aState, sol::this_environment aEnv);
-    sol::object InternalNewIndex(const std::string& acName, sol::object aParam);
     sol::object GetSingletonHandle(const std::string& acName, sol::this_environment aThisEnv);
-    sol::protected_function InternalIndex(const std::string& acName, sol::this_state aState,
-                                          sol::this_environment aEnv);
 
 private:
     TiltedPhoques::Lockable<sol::state, std::recursive_mutex> m_lua;