luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-14 09:05:19 +02:00
Code Activity

better graphics, zlib to work on vc++

Browse Source
This commit is contained in:
Perttu Ahola
2010-12-14 01:56:24 +02:00
parent 47f76d8a51
commit 6129e31b96
18 changed files with 73 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/inventory.h
View File

@@ -59,9 +59,9 @@ private:
class MaterialItem : public InventoryItem
{
public:
MaterialItem(u8 material, u16 count)
MaterialItem(u8 content, u16 count)
{
m_material = material;
m_content = content;
m_count = count;
}
/*
@@ -76,18 +76,26 @@ public:
//os.imbue(std::locale("C"));
os<<getName();
os<<" ";
os<<(unsigned int)m_material;
os<<(unsigned int)m_content;
os<<" ";
os<<m_count;
}
virtual InventoryItem* clone()
{
return new MaterialItem(m_material, m_count);
return new MaterialItem(m_content, m_count);
}
video::ITexture * getImage()
{
u16 tile = content_tile(m_material, v3s16(1,0,0));
return g_tile_materials[tile].getTexture(0);
/*if(m_content == CONTENT_TORCH)
return g_texturecache.get("torch_on_floor");
u16 tile = content_tile(m_content, v3s16(1,0,0));
return g_tile_contents[tile].getTexture(0);*/
if(m_content >= USEFUL_CONTENT_COUNT)
return NULL;
return g_texturecache.get(g_content_inventory_textures[m_content]);
}
std::string getText()
{
@@ -100,7 +108,7 @@ public:
*/
u8 getMaterial()
{
return m_material;
return m_content;
}
u16 getCount()
{
@@ -123,7 +131,7 @@ public:
m_count -= count;
}
private:
u8 m_material;
u8 m_content;
u16 m_count;
};