]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/content_nodemeta.cpp
Omnicleanup: header cleanup, add ModApiUtil shared between game and mainmenu
[dragonfireclient.git] / src / content_nodemeta.cpp
index 2f32cf16a871338c5d107ec3af498a5324a8f2f0..f504924f956a39dcc8fe29bbe323496186efcef7 100644 (file)
@@ -1,26 +1,31 @@
 /*
-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 General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #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
@@ -57,7 +62,7 @@ static bool content_nodemeta_deserialize_legacy_body(
        }
        else if(id == NODEMETA_SIGN) // SignNodeMetadata
        {
-               meta->setString("text", deSerializeLongString(is));
+               meta->setString("text", deSerializeString(is));
                //meta->setString("infotext","\"${text}\"");
                meta->setString("infotext",
                                std::string("\"") + meta->getString("text") + "\"");
@@ -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;]"