Show infotext for unknown items placed on ground
parent
fdf7b3bcdf
commit
e494b5d422
|
@ -184,11 +184,15 @@ public:
|
|||
v3f getPosition()
|
||||
{return m_position;}
|
||||
|
||||
std::string infoText()
|
||||
{return m_infotext;}
|
||||
|
||||
private:
|
||||
core::aabbox3d<f32> m_selection_box;
|
||||
scene::IMeshSceneNode *m_node;
|
||||
v3f m_position;
|
||||
std::string m_inventorystring;
|
||||
std::string m_infotext;
|
||||
};
|
||||
|
||||
/*
|
||||
|
@ -530,7 +534,10 @@ ItemCAO::ItemCAO(IGameDef *gamedef, ClientEnvironment *env):
|
|||
m_node(NULL),
|
||||
m_position(v3f(0,10*BS,0))
|
||||
{
|
||||
ClientActiveObject::registerType(getType(), create);
|
||||
if(!gamedef && !env)
|
||||
{
|
||||
ClientActiveObject::registerType(getType(), create);
|
||||
}
|
||||
}
|
||||
|
||||
ItemCAO::~ItemCAO()
|
||||
|
@ -694,6 +701,23 @@ void ItemCAO::initialize(const std::string &data)
|
|||
}
|
||||
|
||||
updateNodePos();
|
||||
|
||||
/*
|
||||
Set infotext to item name if item cannot be deserialized
|
||||
*/
|
||||
try{
|
||||
InventoryItem *item = NULL;
|
||||
item = InventoryItem::deSerialize(m_inventorystring, m_gamedef);
|
||||
if(item){
|
||||
if(!item->isKnown())
|
||||
m_infotext = "Unknown item: '" + m_inventorystring + "'";
|
||||
}
|
||||
delete item;
|
||||
}
|
||||
catch(SerializationError &e)
|
||||
{
|
||||
m_infotext = "Unknown item: '" + m_inventorystring + "'";
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -343,6 +343,13 @@ video::ITexture * ToolItem::getImageRaw() const
|
|||
}
|
||||
#endif
|
||||
|
||||
bool ToolItem::isKnown() const
|
||||
{
|
||||
IToolDefManager *tdef = m_gamedef->tdef();
|
||||
const ToolDefinition *def = tdef->getToolDefinition(m_toolname);
|
||||
return (def != NULL);
|
||||
}
|
||||
|
||||
/*
|
||||
CraftItem
|
||||
*/
|
||||
|
@ -357,6 +364,13 @@ video::ITexture * CraftItem::getImage() const
|
|||
}
|
||||
#endif
|
||||
|
||||
bool CraftItem::isKnown() const
|
||||
{
|
||||
ICraftItemDefManager *cidef = m_gamedef->cidef();
|
||||
const CraftItemDefinition *def = cidef->getCraftItemDefinition(m_subname);
|
||||
return (def != NULL);
|
||||
}
|
||||
|
||||
u16 CraftItem::getStackMax() const
|
||||
{
|
||||
ICraftItemDefManager *cidef = m_gamedef->cidef();
|
||||
|
|
|
@ -65,6 +65,9 @@ public:
|
|||
// Returns the string used for inventory
|
||||
virtual std::string getItemString();
|
||||
|
||||
// Shall return false if item is not known and cannot be used
|
||||
virtual bool isKnown() const { return true; }
|
||||
|
||||
/*
|
||||
Quantity methods
|
||||
*/
|
||||
|
@ -269,6 +272,8 @@ public:
|
|||
return os.str();
|
||||
}
|
||||
|
||||
virtual bool isKnown() const;
|
||||
|
||||
virtual bool addableTo(const InventoryItem *other) const
|
||||
{
|
||||
if(std::string(other->getName()) != "CraftItem")
|
||||
|
@ -367,6 +372,8 @@ public:
|
|||
return "";
|
||||
}
|
||||
|
||||
virtual bool isKnown() const;
|
||||
|
||||
virtual bool isSubsetOf(const InventoryItem *other) const
|
||||
{
|
||||
if(std::string(other->getName()) != "ToolItem")
|
||||
|
|
Loading…
Reference in New Issue