LuaEvent: Use traverse_get

diasurgical · Oct 15, 2023 · 9e8a69c · 9e8a69c
1 parent 72b49ab
commit 9e8a69c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/3rdParty/sol2/sol_config/sol/config.hpp b/3rdParty/sol2/sol_config/sol/config.hpp
@@ -4,5 +4,4 @@
 #define SOL_SAFE_REFERENCES 1
 #define SOL_SAFE_FUNCTION_CALLS 1
 #define SOL_SAFE_FUNCTION 1
-#define SOL_NO_NIL 0
 #define SOL_IN_DEBUG_DETECTED 0
diff --git a/Source/utils/lua.cpp b/Source/utils/lua.cpp
@@ -129,23 +129,13 @@ void LuaShutdown()
 
 void LuaEvent(std::string_view name)
 {
-	sol::state &lua = *luaState;
-	const sol::object events = lua["Events"];
-	if (!events.is<sol::table>()) {
-		LogError("Events table missing!");
-		return;
-	}
-	const sol::object event = events.as<sol::table>()[name];
-	if (!event.is<sol::table>()) {
-		LogError("Events.{} event not registered", name);
-		return;
-	}
-	const sol::object trigger = event.as<sol::table>()["Trigger"];
-	if (!trigger.is<sol::function>()) {
+	const sol::state &lua = *luaState;
+	const auto trigger = lua.traverse_get<std::optional<sol::object>>("Events", name, "Trigger");
+	if (!trigger.has_value() || !trigger->is<sol::protected_function>()) {
 		LogError("Events.{}.Trigger is not a function", name);
 		return;
 	}
-	const sol::protected_function fn = trigger.as<sol::protected_function>();
+	const sol::protected_function fn = trigger->as<sol::protected_function>();
 	CheckResult(fn());
 }