Remove obsolete createPickedUpItem()
authorPerttu Ahola <celeron55@gmail.com>
Fri, 2 Dec 2011 09:54:23 +0000 (11:54 +0200)
committerPerttu Ahola <celeron55@gmail.com>
Fri, 2 Dec 2011 09:54:23 +0000 (11:54 +0200)
src/content_sao.cpp
src/content_sao.h

index 171e315af87ea40791c48da49603440eb8a3e9e6..770577c568182fb9cfe1665a1a74951f1674c77a 100644 (file)
@@ -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)
index 51461bc957fce95cbfa45b74958739e6aefa09fc..04ee7ee1ba3159024899bf01a0e6f29a0ebe69a6 100644 (file)
@@ -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);