rebase

Author: y5nw

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;
 	}
 

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>