aboutsummaryrefslogtreecommitdiff
path: root/src/content_cao.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/content_cao.cpp')
-rw-r--r--src/content_cao.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 5f53fd644..10aa22e7e 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -166,7 +166,7 @@ public:
void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
IrrlichtDevice *irr);
- void removeFromScene();
+ void removeFromScene(bool permanent);
void updateLight(u8 light_at_pos);
v3s16 getLightPosition();
void updateNodePos();
@@ -236,7 +236,7 @@ void TestCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
updateNodePos();
}
-void TestCAO::removeFromScene()
+void TestCAO::removeFromScene(bool permanent)
{
if(m_node == NULL)
return;
@@ -310,7 +310,7 @@ public:
void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
IrrlichtDevice *irr);
- void removeFromScene();
+ void removeFromScene(bool permanent);
void updateLight(u8 light_at_pos);
v3s16 getLightPosition();
void updateNodePos();
@@ -412,7 +412,7 @@ void ItemCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
updateTexture();
}
-void ItemCAO::removeFromScene()
+void ItemCAO::removeFromScene(bool permanent)
{
if(m_node == NULL)
return;
@@ -648,7 +648,6 @@ public:
bool getCollisionBox(aabb3f *toset) {
if (m_prop.physical) {
- aabb3f retval;
//update collision box
toset->MinEdge = m_prop.collisionbox.MinEdge * BS;
toset->MaxEdge = m_prop.collisionbox.MaxEdge * BS;