From 7df7b35123551dd8f3f501b237d940981e28bb02 Mon Sep 17 00:00:00 2001
From: staphen <staphen@gmail.com>
Date: Sat, 4 Nov 2023 22:08:39 -0400
Subject: [PATCH] Clean up warnings and debugger errors related to the Lua
 console

---
 Source/lua/lua.cpp                | 4 ++++
 Source/lua/modules/dev/quests.cpp | 1 -
 Source/lua/repl.cpp               | 6 +++++-
 Source/lua/repl.hpp               | 2 ++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Source/lua/lua.cpp b/Source/lua/lua.cpp
index c002b4532..33f72f9b9 100644
--- 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
index 72a8ddc5a..eb2d13eb9 100644
--- 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
index 5c0240880..3d60a8198 100644
--- 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
index cd89e8299..8f6ba1204 100644
--- 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