BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix loading of legacy MaterialItems (was loaded as a quite random type)

Browse Source
This commit is contained in:
Perttu Ahola 2011-12-01 12:50:32 +02:00
parent 146be1f0b6
commit 3509714951
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/inventory.cpp
View File

@ -36,6 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "gamedef.h" #include "gamedef.h"
#include "scriptapi.h" #include "scriptapi.h"
#include "strfnd.h" #include "strfnd.h"
#include "nameidmapping.h" // For loading legacy MaterialItems
/* /*
InventoryItem InventoryItem
@ -250,8 +251,10 @@ MaterialItem::MaterialItem(IGameDef *gamedef, std::string nodename, u16 count):
MaterialItem::MaterialItem(IGameDef *gamedef, content_t content, u16 count): MaterialItem::MaterialItem(IGameDef *gamedef, content_t content, u16 count):
InventoryItem(gamedef, count) InventoryItem(gamedef, count)
{ {
INodeDefManager *ndef = m_gamedef->ndef(); NameIdMapping legacy_nimap;
std::string nodename = ndef->get(content).name; content_mapnode_get_name_id_mapping(&legacy_nimap);
std::string nodename;
legacy_nimap.getName(content, nodename);
if(nodename == "") if(nodename == "")
nodename = "unknown_block"; nodename = "unknown_block";
m_nodename = nodename; m_nodename = nodename;