Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove obsolete createPickedUpItem()

This commit is contained in:
Perttu Ahola 2011-12-02 11:54:23 +02:00
parent e8b0722137
commit a17efe6e8f
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/content_sao.cpp
View File

@ -913,14 +913,6 @@ std::string FireflySAO::getStaticData()
return os.str(); return os.str();
} }
InventoryItem* FireflySAO::createPickedUpItem()
{
std::istringstream is("CraftItem firefly 1", std::ios_base::binary);
IGameDef *gamedef = m_env->getGameDef();
InventoryItem *item = InventoryItem::deSerialize(is, gamedef);
return item;
}
/* /*
MobV2SAO MobV2SAO
*/ */
@ -1664,15 +1656,6 @@ std::string LuaEntitySAO::getStaticData()
return os.str(); return os.str();
} }
InventoryItem* LuaEntitySAO::createPickedUpItem()
{
// TODO: Ask item from scriptapi
std::istringstream is("CraftItem testobject1 1", std::ios_base::binary);
IGameDef *gamedef = m_env->getGameDef();
InventoryItem *item = InventoryItem::deSerialize(is, gamedef);
return item;
}
void LuaEntitySAO::punch(ServerActiveObject *puncher, float time_from_last_punch) void LuaEntitySAO::punch(ServerActiveObject *puncher, float time_from_last_punch)
{ {
if(!m_registered) if(!m_registered)

4
src/content_sao.h
View File

@ -95,7 +95,6 @@ public:
void step(float dtime, bool send_recommended); void step(float dtime, bool send_recommended);
std::string getClientInitializationData(); std::string getClientInitializationData();
std::string getStaticData(); std::string getStaticData();
InventoryItem* createPickedUpItem(){return NULL;}
void punch(ServerActiveObject *puncher, float time_from_last_punch); void punch(ServerActiveObject *puncher, float time_from_last_punch);
bool isPeaceful(){return false;} bool isPeaceful(){return false;}
private: private:
@ -126,7 +125,6 @@ public:
void step(float dtime, bool send_recommended); void step(float dtime, bool send_recommended);
std::string getClientInitializationData(); std::string getClientInitializationData();
std::string getStaticData(); std::string getStaticData();
InventoryItem* createPickedUpItem();
private: private:
bool m_is_active; bool m_is_active;
IntervalLimiter m_inactive_interval; IntervalLimiter m_inactive_interval;
@ -155,7 +153,6 @@ public:
std::string getStaticData(); std::string getStaticData();
std::string getClientInitializationData(); std::string getClientInitializationData();
void step(float dtime, bool send_recommended); void step(float dtime, bool send_recommended);
InventoryItem* createPickedUpItem(){return NULL;}
void punch(ServerActiveObject *puncher, float time_from_last_punch); void punch(ServerActiveObject *puncher, float time_from_last_punch);
bool isPeaceful(); bool isPeaceful();
private: private:
@ -209,7 +206,6 @@ public:
void step(float dtime, bool send_recommended); void step(float dtime, bool send_recommended);
std::string getClientInitializationData(); std::string getClientInitializationData();
std::string getStaticData(); std::string getStaticData();
InventoryItem* createPickedUpItem();
void punch(ServerActiveObject *puncher, float time_from_last_punch); void punch(ServerActiveObject *puncher, float time_from_last_punch);
void rightClick(ServerActiveObject *clicker); void rightClick(ServerActiveObject *clicker);
void setPos(v3f pos); void setPos(v3f pos);