Porting: Refactor initalizePaths()

[minetest.git] / src / content_nodemeta.cpp

diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp
index 676edfcf34408e0afe6311ec02d37e925b966f72..f504924f956a39dcc8fe29bbe323496186efcef7 100644 (file)
--- a/src/content_nodemeta.cpp
+++ b/src/content_nodemeta.cpp
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -18,9 +18,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "content_nodemeta.h"
+#include "nodemetadata.h"
+#include "nodetimer.h"
 #include "inventory.h"
 #include "log.h"
-#include "utility.h"
+#include "serialization.h"
+#include "util/serialize.h"
+#include "util/string.h"
+#include "constants.h" // MAP_BLOCKSIZE
 #include <sstream>
 
 #define NODEMETA_GENERIC 1
@@ -61,7 +66,7 @@ static bool content_nodemeta_deserialize_legacy_body(
                //meta->setString("infotext","\"${text}\"");
                meta->setString("infotext",
                                std::string("\"") + meta->getString("text") + "\"");
-               meta->setString("formspec","hack:sign_text_input");
+               meta->setString("formspec","field[text;;${text}]");
                return false;
        }
        else if(id == NODEMETA_CHEST) // ChestNodeMetadata
@@ -75,7 +80,7 @@ static bool content_nodemeta_deserialize_legacy_body(
                }
                assert(inv->getList("main") && !inv->getList("0"));
                
-               meta->setString("formspec","invsize[8,9;]"
+               meta->setString("formspec","size[8,9]"
                                "list[current_name;main;0,0;8,4;]"
                                "list[current_player;main;0,5;8,4;]");
                return false;
@@ -92,7 +97,7 @@ static bool content_nodemeta_deserialize_legacy_body(
                }
                assert(inv->getList("main") && !inv->getList("0"));
                
-               meta->setString("formspec","invsize[8,9;]"
+               meta->setString("formspec","size[8,9]"
                                "list[current_name;main;0,0;8,4;]"
                                "list[current_player;main;0,5;8,4;]");
                return false;
@@ -113,7 +118,7 @@ static bool content_nodemeta_deserialize_legacy_body(
                is>>temp;
                meta->setString("src_time", ftos((float)temp/10));
 
-               meta->setString("formspec","invsize[8,9;]"
+               meta->setString("formspec","size[8,9]"
                        "list[current_name;fuel;2,3;1,1;]"
                        "list[current_name;src;2,1;1,1;]"
                        "list[current_name;dst;5,1;2,2;]"