Clean up warnings and debugger errors related to the Lua console

diasurgical · Nov 5, 2023 · d0f4067 · d0f4067
1 parent 4f23762
commit d0f4067
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/Source/lua/lua.cpp b/Source/lua/lua.cpp
@@ -20,6 +20,7 @@
 
 #ifdef _DEBUG
 #include "lua/modules/dev.hpp"
+#include "lua/repl.hpp"
 #endif
 
 namespace devilution {
@@ -252,6 +253,9 @@ void LuaInitialize()
 
 void LuaShutdown()
 {
+#ifdef _DEBUG
+	LuaReplShutdown();
+#endif
 	CurrentLuaState = std::nullopt;
 }
 

diff --git a/Source/lua/modules/dev/quests.cpp b/Source/lua/modules/dev/quests.cpp
@@ -1,4 +1,3 @@
-#pragma once
 #ifdef _DEBUG
 #include "lua/modules/dev/quests.hpp"
 

diff --git a/Source/lua/repl.cpp b/Source/lua/repl.cpp
@@ -48,7 +48,6 @@ int LuaPrintToConsole(lua_State *state)
 
 void CreateReplEnvironment()
 {
-	sol::state &lua = GetLuaState();
 	sol::environment env = CreateLuaSandbox();
 	env["print"] = LuaPrintToConsole;
 	lua_setwarnf(env.lua_state(), LuaConsoleWarn, /*ud=*/nullptr);
@@ -103,5 +102,10 @@ tl::expected<std::string, std::string> RunLuaReplLine(std::string_view code)
 	return sol::utility::to_string(sol::stack_object(result));
 }
 
+void LuaReplShutdown()
+{
+	replEnv = std::nullopt;
+}
+
 } // namespace devilution
 #endif // _DEBUG
diff --git a/Source/lua/repl.hpp b/Source/lua/repl.hpp
@@ -13,5 +13,7 @@ tl::expected<std::string, std::string> RunLuaReplLine(std::string_view code);
 
 sol::environment &GetLuaReplEnvironment();
 
+void LuaReplShutdown();
+
 } // namespace devilution
 #endif // _DEBUG