From f64a6259b2b5e79103cfd4bc151304e6da39bca9 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Sun, 22 May 2016 13:31:41 +0200
Subject: [PATCH] Fix a m_camera not used warning fix pointed by clang
---
src/content_cao.cpp | 3 +--
src/content_cao.h | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index d701e4f72..35ab1c508 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -546,7 +546,6 @@ GenericCAO::GenericCAO(IGameDef *gamedef, ClientEnvironment *env):
//
m_smgr(NULL),
m_irr(NULL),
- m_camera(NULL),
m_gamedef(NULL),
m_selection_box(-BS/3.,-BS/3.,-BS/3., BS/3.,BS/3.,BS/3.),
m_meshnode(NULL),
@@ -804,7 +803,7 @@ void GenericCAO::removeFromScene(bool permanent)
}
}
-void GenericCAO::addToScene(scene::ISceneManager *smgr,
+void GenericCAO::addToScene(scene::ISceneManager *smgr,
ITextureSource *tsrc, IrrlichtDevice *irr)
{
m_smgr = smgr;
diff --git a/src/content_cao.h b/src/content_cao.h
index a166ff494..bf99fd3ba 100644
--- a/src/content_cao.h
+++ b/src/content_cao.h
@@ -68,7 +68,6 @@ class GenericCAO : public ClientActiveObject
//
scene::ISceneManager *m_smgr;
IrrlichtDevice *m_irr;
- Camera* m_camera;
IGameDef *m_gamedef;
aabb3f m_selection_box;
scene::IMeshSceneNode *m_meshnode;
@@ -206,7 +205,7 @@ class GenericCAO : public ClientActiveObject
float time_from_last_punch=1000000);
std::string debugInfoText();
-
+
std::string infoText()
{
return m_prop.infotext;
--
GitLab