rebase

luanti-org · Dec 22, 2024 · 734ebbb · 734ebbb
1 parent 59c760a
commit 734ebbb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/client/game_formspec.cpp b/src/client/game_formspec.cpp
@@ -487,8 +487,8 @@ bool GameFormSpec::handleCallbacks()
 	}
 
 	if (g_gamecallback->keyconfig_requested) {
-		(void)make_irr<GUIKeyChangeMenu>(client, guienv, &input->joystick,
-				texture_src, sound_manager.get(), client->getFormspecPrepend());
+		(void)make_irr<GUIKeyChangeMenu>(m_client, guienv, &m_input->joystick,
+				texture_src, m_client->getSoundManager(), m_client->getFormspecPrepend());
 		g_gamecallback->keyconfig_requested = false;
 	}
 

diff --git a/src/gui/guiKeyChangeMenu.h b/src/gui/guiKeyChangeMenu.h
@@ -8,6 +8,7 @@
 
 #include "guiFormSpecMenu.h"
 #include "mainmenumanager.h"
+#include "settings.h"
 #include "client/client.h"
 #include "client/keycode.h"
 #include <string>