Merge branch 'master' of https://github.com/minetest/minetest

1 files changed, 2 insertions, 7 deletions

diff --git a/src/client/fontengine.h b/src/client/fontengine.h
index c6efa0df4..e27ef60e9 100644
--- a/src/client/fontengine.h
+++ b/src/client/fontengine.h
@@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <map>
 #include <vector>
 #include "util/basic_macros.h"
+#include "irrlichttypes.h"
 #include <IGUIFont.h>
 #include <IGUISkin.h>
 #include <IGUIEnvironment.h>
@@ -61,7 +62,7 @@ class FontEngine
 {
 public:
 
-	FontEngine(Settings* main_settings, gui::IGUIEnvironment* env);
+	FontEngine(gui::IGUIEnvironment* env);
 
 	~FontEngine();
 
@@ -127,9 +128,6 @@ public:
 	/** get font size for a specific mode */
 	unsigned int getFontSize(FontMode mode);
 
-	/** initialize font engine */
-	void initialize(Settings* main_settings, gui::IGUIEnvironment* env);
-
 	/** update internal parameters from settings */
 	void readSettings();
 
@@ -149,9 +147,6 @@ private:
 	/** clean cache */
 	void cleanCache();
 
-	/** pointer to settings for registering callbacks or reading config */
-	Settings* m_settings = nullptr;
-
 	/** pointer to irrlicht gui environment */
 	gui::IGUIEnvironment* m_env = nullptr;