From: Perttu Ahola Date: Fri, 2 Dec 2011 09:54:23 +0000 (+0200) Subject: Remove obsolete createPickedUpItem() X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=a17efe6e8f069de7a51c2fc5fd89ee3fbe65ff28;p=zefram%2Fminetest%2Fminetest_engine.git Remove obsolete createPickedUpItem() --- diff --git a/src/content_sao.cpp b/src/content_sao.cpp index 171e315a..770577c5 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -913,14 +913,6 @@ std::string FireflySAO::getStaticData() 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 */ @@ -1664,15 +1656,6 @@ std::string LuaEntitySAO::getStaticData() 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) { if(!m_registered) diff --git a/src/content_sao.h b/src/content_sao.h index 51461bc9..04ee7ee1 100644 --- a/src/content_sao.h +++ b/src/content_sao.h @@ -95,7 +95,6 @@ public: void step(float dtime, bool send_recommended); std::string getClientInitializationData(); std::string getStaticData(); - InventoryItem* createPickedUpItem(){return NULL;} void punch(ServerActiveObject *puncher, float time_from_last_punch); bool isPeaceful(){return false;} private: @@ -126,7 +125,6 @@ public: void step(float dtime, bool send_recommended); std::string getClientInitializationData(); std::string getStaticData(); - InventoryItem* createPickedUpItem(); private: bool m_is_active; IntervalLimiter m_inactive_interval; @@ -155,7 +153,6 @@ public: std::string getStaticData(); std::string getClientInitializationData(); void step(float dtime, bool send_recommended); - InventoryItem* createPickedUpItem(){return NULL;} void punch(ServerActiveObject *puncher, float time_from_last_punch); bool isPeaceful(); private: @@ -209,7 +206,6 @@ public: void step(float dtime, bool send_recommended); std::string getClientInitializationData(); std::string getStaticData(); - InventoryItem* createPickedUpItem(); void punch(ServerActiveObject *puncher, float time_from_last_punch); void rightClick(ServerActiveObject *clicker); void setPos(v3f pos);