From b49e5cfc7013cef7e9af79d17e04f7e7e4c377d4 Mon Sep 17 00:00:00 2001 From: Kahrl Date: Fri, 24 Oct 2014 16:22:05 +0200 Subject: Remove m_ext_ptr in GUIFormSpecMenu, replaced by refcount mechanism --- src/guiFormSpecMenu.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/guiFormSpecMenu.cpp') diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index a502c9682..e82ea829c 100644 --- a/src/guiFormSpecMenu.cpp +++ b/src/guiFormSpecMenu.cpp @@ -68,12 +68,11 @@ with this program; if not, write to the Free Software Foundation, Inc., /* GUIFormSpecMenu */ - GUIFormSpecMenu::GUIFormSpecMenu(irr::IrrlichtDevice* dev, gui::IGUIElement* parent, s32 id, IMenuManager *menumgr, InventoryManager *invmgr, IGameDef *gamedef, ISimpleTextureSource *tsrc, IFormSource* fsrc, TextDest* tdst, - GUIFormSpecMenu** ext_ptr, Client* client) : + Client* client) : GUIModalMenu(dev->getGUIEnvironment(), parent, id, menumgr), m_device(dev), m_invmgr(invmgr), @@ -89,7 +88,6 @@ GUIFormSpecMenu::GUIFormSpecMenu(irr::IrrlichtDevice* dev, m_lock(false), m_form_src(fsrc), m_text_dst(tdst), - m_ext_ptr(ext_ptr), m_font(dev->getGUIEnvironment()->getSkin()->getFont()), m_formspec_version(0) #ifdef __ANDROID__ @@ -130,11 +128,6 @@ GUIFormSpecMenu::~GUIFormSpecMenu() if (m_text_dst != NULL) { delete m_text_dst; } - - if (m_ext_ptr != NULL) { - assert(*m_ext_ptr == this); - *m_ext_ptr = NULL; - } } void GUIFormSpecMenu::removeChildren() -- cgit v1.2.3