From 35097149515e80e9a11c51161f0138b68ee07a3e Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Thu, 1 Dec 2011 12:50:32 +0200 Subject: Fix loading of legacy MaterialItems (was loaded as a quite random type) --- src/inventory.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/inventory.cpp b/src/inventory.cpp index e8475b741..0600729c6 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -36,6 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "gamedef.h" #include "scriptapi.h" #include "strfnd.h" +#include "nameidmapping.h" // For loading legacy MaterialItems /* InventoryItem @@ -250,8 +251,10 @@ MaterialItem::MaterialItem(IGameDef *gamedef, std::string nodename, u16 count): MaterialItem::MaterialItem(IGameDef *gamedef, content_t content, u16 count): InventoryItem(gamedef, count) { - INodeDefManager *ndef = m_gamedef->ndef(); - std::string nodename = ndef->get(content).name; + NameIdMapping legacy_nimap; + content_mapnode_get_name_id_mapping(&legacy_nimap); + std::string nodename; + legacy_nimap.getName(content, nodename); if(nodename == "") nodename = "unknown_block"; m_nodename = nodename; -- cgit v1.2.3