Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-23 16:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix loading of legacy chests

Browse Source
This commit is contained in:
Perttu Ahola 2012-06-03 00:32:49 +03:00
parent 9c3830dd35
commit 81c5e5200b
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/content_nodemeta.cpp
View File

@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "inventory.h" #include "inventory.h"
#include "log.h" #include "log.h"
#include "utility.h" #include "utility.h"
#include <sstream>
#define NODEMETA_GENERIC 1 #define NODEMETA_GENERIC 1
#define NODEMETA_SIGN 14 #define NODEMETA_SIGN 14
@ -70,11 +71,10 @@ static bool content_nodemeta_deserialize_legacy_body(
// Rename inventory list "0" to "main" // Rename inventory list "0" to "main"
Inventory *inv = meta->getInventory(); Inventory *inv = meta->getInventory();
if(!inv->getList("main") && inv->getList("0")){ if(!inv->getList("main") && inv->getList("0")){
inv->addList("main", 8*4); inv->getList("0")->setName("main");
*inv->getList("main") = *inv->getList("0");
inv->deleteList("0");
} }
assert(inv->getList("main") && !inv->getList("0"));
meta->setString("formspec","invsize[8,9;]" meta->setString("formspec","invsize[8,9;]"
"list[current_name;main;0,0;8,4;]" "list[current_name;main;0,0;8,4;]"
"list[current_player;main;0,5;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" // Rename inventory list "0" to "main"
Inventory *inv = meta->getInventory(); Inventory *inv = meta->getInventory();
if(!inv->getList("main") && inv->getList("0")){ if(!inv->getList("main") && inv->getList("0")){
inv->addList("main", 8*4); inv->getList("0")->setName("main");
*inv->getList("main") = *inv->getList("0");
inv->deleteList("0");
} }
assert(inv->getList("main") && !inv->getList("0"));
meta->setString("formspec","invsize[8,9;]" meta->setString("formspec","invsize[8,9;]"
"list[current_name;main;0,0;8,4;]" "list[current_name;main;0,0;8,4;]"
"list[current_player;main;0,5;8,4;]"); "list[current_player;main;0,5;8,4;]");

5
src/inventory.cpp
View File

@ -458,6 +458,11 @@ void InventoryList::setSize(u32 newsize)
m_size = newsize; m_size = newsize;
} }
void InventoryList::setName(const std::string &name)
{
m_name = name;
}
void InventoryList::serialize(std::ostream &os) const void InventoryList::serialize(std::ostream &os) const
{ {
//os.imbue(std::locale("C")); //os.imbue(std::locale("C"));

1
src/inventory.h
View File

@ -176,6 +176,7 @@ public:
~InventoryList(); ~InventoryList();
void clearItems(); void clearItems();
void setSize(u32 newsize); void setSize(u32 newsize);
void setName(const std::string &name);
void serialize(std::ostream &os) const; void serialize(std::ostream &os) const;
void deSerialize(std::istream &is); void deSerialize(std::istream &is);