Make sure none of the irrlicht member objects of GenericCAO are deleted prior deletio...

[minetest.git] / src / game.cpp

diff --git a/src/game.cpp b/src/game.cpp
index c2ee7f311116a15b32bc3e0a9b08d246de756bf2..3acc93828817f1bc7629abb37abb80ee08b1e13a 100644 (file)
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -31,7 +31,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "guiPasswordChange.h"
 #include "guiVolumeChange.h"
 #include "guiFormSpecMenu.h"
-#include "guiTextInputMenu.h"
 #include "tool.h"
 #include "guiChatConsole.h"
 #include "config.h"
@@ -2905,26 +2904,7 @@ void the_game(bool &kill, bool random_input, InputHandler *input,
                                repeat_rightclick_timer = 0;
                                infostream<<"Ground right-clicked"<<std::endl;
 
-                               // Sign special case, at least until formspec is properly implemented.
-                               // Deprecated?
-                               if(meta && meta->getString("formspec") == "hack:sign_text_input"
-                                               && !random_input
-                                               && !input->isKeyDown(getKeySetting("keymap_sneak")))
-                               {
-                                       infostream<<"Launching metadata text input"<<std::endl;
-
-                                       // Get a new text for it
-
-                                       TextDest *dest = new TextDestNodeMetadata(nodepos, &client);
-
-                                       std::wstring wtext = narrow_to_wide(meta->getString("text"));
-
-                                       (new GUITextInputMenu(guienv, guiroot, -1,
-                                                       &g_menumgr, dest,
-                                                       wtext))->drop();
-                               }
-                               // If metadata provides an inventory view, activate it
-                               else if(meta && meta->getString("formspec") != "" && !random_input
+                               if(meta && meta->getString("formspec") != "" && !random_input
                                                && !input->isKeyDown(getKeySetting("keymap_sneak")))
                                {
                                        infostream<<"Launching custom inventory view"<<std::endl;
@@ -3247,7 +3227,7 @@ void the_game(bool &kill, bool random_input, InputHandler *input,
                                core::rect<s32> rect(
                                                10,
                                                status_y - guitext_status->getTextHeight(),
-                                               screensize.X - 10,
+                                               10 + guitext_status->getTextWidth(),
                                                status_y
                                );
                                guitext_status->setRelativePosition(rect);