From 81c5e5200bcc20be6b1513a440b2c45985fe3c49 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Sun, 3 Jun 2012 00:32:49 +0300 Subject: Fix loading of legacy chests --- src/content_nodemeta.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/content_nodemeta.cpp') diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp index a2a341ae0..2f32cf16a 100644 --- a/src/content_nodemeta.cpp +++ b/src/content_nodemeta.cpp @@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "inventory.h" #include "log.h" #include "utility.h" +#include #define NODEMETA_GENERIC 1 #define NODEMETA_SIGN 14 @@ -70,11 +71,10 @@ static bool content_nodemeta_deserialize_legacy_body( // Rename inventory list "0" to "main" Inventory *inv = meta->getInventory(); if(!inv->getList("main") && inv->getList("0")){ - inv->addList("main", 8*4); - *inv->getList("main") = *inv->getList("0"); - inv->deleteList("0"); + inv->getList("0")->setName("main"); } - + assert(inv->getList("main") && !inv->getList("0")); + meta->setString("formspec","invsize[8,9;]" "list[current_name;main;0,0;8,4;]" "list[current_player;main;0,5;8,4;]"); @@ -88,11 +88,10 @@ static bool content_nodemeta_deserialize_legacy_body( // Rename inventory list "0" to "main" Inventory *inv = meta->getInventory(); if(!inv->getList("main") && inv->getList("0")){ - inv->addList("main", 8*4); - *inv->getList("main") = *inv->getList("0"); - inv->deleteList("0"); + inv->getList("0")->setName("main"); } - + assert(inv->getList("main") && !inv->getList("0")); + meta->setString("formspec","invsize[8,9;]" "list[current_name;main;0,0;8,4;]" "list[current_player;main;0,5;8,4;]"); -- cgit v1.2.3