2 files changed, 32 insertions, 0 deletions
diff --git a/engines/hdb/lua-script.cpp b/engines/hdb/lua-script.cpp
index b19feb6046..13f406608b 100644
--- a/engines/hdb/lua-script.cpp
+++ b/engines/hdb/lua-script.cpp
@@ -115,6 +115,11 @@ LuaScript::LuaScript() {
 
 	_state = NULL;
 	_systemInit = false;
+
+
+	_pcallErrorhandlerRegistryIndex = 0;
+	_globalLuaStream = nullptr;
+	_globalLuaLength = 0;
 }
 
 LuaScript::~LuaScript() {
diff --git a/engines/hdb/window.cpp b/engines/hdb/window.cpp
index 0f89c364a5..b4a34bd146 100644
--- a/engines/hdb/window.cpp
+++ b/engines/hdb/window.cpp
@@ -76,6 +76,33 @@ Window::Window() {
 	}
 
 	_pauseY = (g_hdb->_screenHeight / 2 - 64);
+
+	_gGfxTM = nullptr;
+	_gGfxTR = nullptr;
+	_gGfxL = nullptr;
+	_gGfxM = nullptr;
+	_gGfxR = nullptr;
+	_gGfxBL = nullptr;
+	_gGfxBM = nullptr;
+	_gGfxBR = nullptr;
+	_gGfxTitleL = nullptr;
+	_gGfxTitleM = nullptr;
+	_gGfxTitleR = nullptr;
+	_gfxIndent = nullptr;
+	_gfxArrowTo = nullptr;
+	_gfxHandright = nullptr;
+	_gfxTry = nullptr;
+	_gfxAgain = nullptr;
+	_gfxInvSelect = nullptr;
+	_gfxLevelRestart = nullptr;
+	_gfxPausePlaque = nullptr;
+	_gemGfx = nullptr;
+	_mstoneGfx = nullptr;
+	_gfxResources = nullptr;
+	_gfxDeliveries = nullptr;
+	_gfxInfobar = nullptr;
+	_gfxDarken = nullptr;
+	_infobarDimmed = 0;
 }
 
 Window::~Window() {