From a17efe6e8f069de7a51c2fc5fd89ee3fbe65ff28 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Fri, 2 Dec 2011 11:54:23 +0200
Subject: [PATCH] Remove obsolete createPickedUpItem()
---
src/content_sao.cpp | 17 -----------------
src/content_sao.h | 4 ----
2 files changed, 21 deletions(-)
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 171e315af..770577c56 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 51461bc95..04ee7ee1b 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -95,7 +95,6 @@ class Oerkki1SAO : public ServerActiveObject
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 @@ class FireflySAO : public ServerActiveObject
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 @@ class MobV2SAO : public ServerActiveObject
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 @@ class LuaEntitySAO : public ServerActiveObject
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);
--
GitLab