summaryrefslogtreecommitdiff
path: root/src/guiEngine.cpp
diff options
context:
space:
mode:
authorsapier <Sapier at GMX dot net>2014-04-20 02:40:25 +0200
committersapier <Sapier at GMX dot net>2014-04-22 20:59:01 +0200
commit127f354e7a5e85cfc46304499e7c8619fc9538c8 (patch)
tree61f77a04d87f8b81a072a7e1f3b68003142f331f /src/guiEngine.cpp
parente7ef4f07cb19aeed768c9010ac49cf5801541ded (diff)
downloadminetest-127f354e7a5e85cfc46304499e7c8619fc9538c8.tar.gz
minetest-127f354e7a5e85cfc46304499e7c8619fc9538c8.tar.bz2
minetest-127f354e7a5e85cfc46304499e7c8619fc9538c8.zip
Fix formspec replacement handling for in game formspecs
Diffstat (limited to 'src/guiEngine.cpp')
-rw-r--r--src/guiEngine.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp
index bba000640..b929c4f71 100644
--- a/src/guiEngine.cpp
+++ b/src/guiEngine.cpp
@@ -166,7 +166,7 @@ GUIEngine::GUIEngine( irr::IrrlichtDevice* dev,
rect,false,true,0,-1);
//create formspecsource
- m_formspecgui = new FormspecFormSource("",&m_formspecgui);
+ m_formspecgui = new FormspecFormSource("");
/* Create menu */
m_menu =
@@ -176,12 +176,13 @@ GUIEngine::GUIEngine( irr::IrrlichtDevice* dev,
m_menumanager,
0 /* &client */,
0 /* gamedef */,
- m_texture_source);
+ m_texture_source,
+ m_formspecgui,
+ m_buttonhandler,
+ NULL);
m_menu->allowClose(false);
m_menu->lockSize(true,v2u32(800,600));
- m_menu->setFormSource(m_formspecgui);
- m_menu->setTextDest(m_buttonhandler);
// Initialize scripting