mirror of
https://github.com/minetest/minetest.git
synced 2024-11-09 01:03:46 +01:00
separated inventory-related game content to content_inventory.{h,cpp}
This commit is contained in:
parent
a23f6a1548
commit
cced6aaf8d
@ -50,6 +50,7 @@ configure_file(
|
||||
)
|
||||
|
||||
set(common_SRCS
|
||||
content_inventory.cpp
|
||||
content_nodemeta.cpp
|
||||
content_craft.cpp
|
||||
content_mapblock.cpp
|
||||
|
98
src/content_inventory.cpp
Normal file
98
src/content_inventory.cpp
Normal file
@ -0,0 +1,98 @@
|
||||
/*
|
||||
Minetest-c55
|
||||
Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#include "content_inventory.h"
|
||||
#include "inventory.h"
|
||||
#include "serverobject.h"
|
||||
#include "content_mapnode.h"
|
||||
|
||||
bool item_material_is_cookable(u8 content)
|
||||
{
|
||||
if(content == CONTENT_TREE)
|
||||
return true;
|
||||
else if(content == CONTENT_COBBLE)
|
||||
return true;
|
||||
else if(content == CONTENT_SAND)
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
InventoryItem* item_material_create_cook_result(u8 content)
|
||||
{
|
||||
if(content == CONTENT_TREE)
|
||||
return new CraftItem("lump_of_coal", 1);
|
||||
else if(content == CONTENT_COBBLE)
|
||||
return new MaterialItem(CONTENT_STONE, 1);
|
||||
else if(content == CONTENT_SAND)
|
||||
return new MaterialItem(CONTENT_GLASS, 1);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
std::string item_craft_get_image_name(const std::string &subname)
|
||||
{
|
||||
if(subname == "Stick")
|
||||
return "stick.png";
|
||||
else if(subname == "lump_of_coal")
|
||||
return "lump_of_coal.png";
|
||||
else if(subname == "lump_of_iron")
|
||||
return "lump_of_iron.png";
|
||||
else if(subname == "steel_ingot")
|
||||
return "steel_ingot.png";
|
||||
else if(subname == "rat")
|
||||
return "rat.png";
|
||||
else
|
||||
return "cloud.png"; // just something
|
||||
}
|
||||
|
||||
ServerActiveObject* item_craft_create_object(const std::string &subname,
|
||||
ServerEnvironment *env, u16 id, v3f pos)
|
||||
{
|
||||
if(subname == "rat")
|
||||
{
|
||||
ServerActiveObject *obj = new RatSAO(env, id, pos);
|
||||
return obj;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
s16 item_craft_get_drop_count(const std::string &subname)
|
||||
{
|
||||
if(subname == "rat")
|
||||
return 1;
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
bool item_craft_is_cookable(const std::string &subname)
|
||||
{
|
||||
if(subname == "lump_of_iron")
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
InventoryItem* item_craft_create_cook_result(const std::string &subname)
|
||||
{
|
||||
if(subname == "lump_of_iron")
|
||||
return new CraftItem("steel_ingot", 1);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
41
src/content_inventory.h
Normal file
41
src/content_inventory.h
Normal file
@ -0,0 +1,41 @@
|
||||
/*
|
||||
Minetest-c55
|
||||
Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#ifndef CONTENT_INVENTORY_HEADER
|
||||
#define CONTENT_INVENTORY_HEADER
|
||||
|
||||
#include "common_irrlicht.h" // For u8, s16
|
||||
#include <string>
|
||||
|
||||
class InventoryItem;
|
||||
class ServerActiveObject;
|
||||
class ServerEnvironment;
|
||||
|
||||
bool item_material_is_cookable(u8 content);
|
||||
InventoryItem* item_material_create_cook_result(u8 content);
|
||||
|
||||
std::string item_craft_get_image_name(const std::string &subname);
|
||||
ServerActiveObject* item_craft_create_object(const std::string &subname,
|
||||
ServerEnvironment *env, u16 id, v3f pos);
|
||||
s16 item_craft_get_drop_count(const std::string &subname);
|
||||
bool item_craft_is_cookable(const std::string &subname);
|
||||
InventoryItem* item_craft_create_cook_result(const std::string &subname);
|
||||
|
||||
#endif
|
||||
|
@ -29,6 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
#include "main.h"
|
||||
#include "serverobject.h"
|
||||
#include "content_mapnode.h"
|
||||
#include "content_inventory.h"
|
||||
|
||||
/*
|
||||
InventoryItem
|
||||
@ -111,36 +112,12 @@ ServerActiveObject* InventoryItem::createSAO(ServerEnvironment *env, u16 id, v3f
|
||||
|
||||
bool MaterialItem::isCookable()
|
||||
{
|
||||
if(m_content == CONTENT_TREE)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
else if(m_content == CONTENT_COBBLE)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
else if(m_content == CONTENT_SAND)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
return item_material_is_cookable(m_content);
|
||||
}
|
||||
|
||||
InventoryItem *MaterialItem::createCookResult()
|
||||
{
|
||||
if(m_content == CONTENT_TREE)
|
||||
{
|
||||
return new CraftItem("lump_of_coal", 1);
|
||||
}
|
||||
else if(m_content == CONTENT_COBBLE)
|
||||
{
|
||||
return new MaterialItem(CONTENT_STONE, 1);
|
||||
}
|
||||
else if(m_content == CONTENT_SAND)
|
||||
{
|
||||
return new MaterialItem(CONTENT_GLASS, 1);
|
||||
}
|
||||
return NULL;
|
||||
return item_material_create_cook_result(m_content);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -153,21 +130,8 @@ video::ITexture * CraftItem::getImage()
|
||||
if(g_texturesource == NULL)
|
||||
return NULL;
|
||||
|
||||
std::string name;
|
||||
std::string name = item_craft_get_image_name(m_subname);
|
||||
|
||||
if(m_subname == "Stick")
|
||||
name = "stick.png";
|
||||
else if(m_subname == "lump_of_coal")
|
||||
name = "lump_of_coal.png";
|
||||
else if(m_subname == "lump_of_iron")
|
||||
name = "lump_of_iron.png";
|
||||
else if(m_subname == "steel_ingot")
|
||||
name = "steel_ingot.png";
|
||||
else if(m_subname == "rat")
|
||||
name = "rat.png";
|
||||
else
|
||||
name = "cloud.png";
|
||||
|
||||
// Get such a texture
|
||||
return g_texturesource->getTextureRaw(name);
|
||||
}
|
||||
@ -176,48 +140,35 @@ video::ITexture * CraftItem::getImage()
|
||||
ServerActiveObject* CraftItem::createSAO(ServerEnvironment *env, u16 id, v3f pos)
|
||||
{
|
||||
// Special cases
|
||||
if(m_subname == "rat")
|
||||
{
|
||||
ServerActiveObject *obj = new RatSAO(env, id, pos);
|
||||
ServerActiveObject *obj = item_craft_create_object(m_subname, env, id, pos);
|
||||
if(obj)
|
||||
return obj;
|
||||
}
|
||||
// Default
|
||||
else
|
||||
{
|
||||
return InventoryItem::createSAO(env, id, pos);
|
||||
}
|
||||
return InventoryItem::createSAO(env, id, pos);
|
||||
}
|
||||
|
||||
u16 CraftItem::getDropCount()
|
||||
{
|
||||
// Special cases
|
||||
if(m_subname == "rat")
|
||||
return 1;
|
||||
s16 dc = item_craft_get_drop_count(m_subname);
|
||||
if(dc != -1)
|
||||
return dc;
|
||||
// Default
|
||||
else
|
||||
return InventoryItem::getDropCount();
|
||||
return InventoryItem::getDropCount();
|
||||
}
|
||||
|
||||
bool CraftItem::isCookable()
|
||||
{
|
||||
if(m_subname == "lump_of_iron")
|
||||
{
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
return item_craft_is_cookable(m_subname);
|
||||
}
|
||||
|
||||
InventoryItem *CraftItem::createCookResult()
|
||||
{
|
||||
if(m_subname == "lump_of_iron")
|
||||
{
|
||||
return new CraftItem("steel_ingot", 1);
|
||||
}
|
||||
return NULL;
|
||||
return item_craft_create_cook_result(m_subname);
|
||||
}
|
||||
|
||||
/*
|
||||
MapBlockObjectItem
|
||||
MapBlockObjectItem DEPRECATED
|
||||
TODO: Remove
|
||||
*/
|
||||
#ifndef SERVER
|
||||
|
Loading…
Reference in New Issue
Block a user