diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2016-05-22 13:31:41 +0200 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2016-05-22 13:31:41 +0200 |
| commit | f64a6259b2b5e79103cfd4bc151304e6da39bca9 (patch) | |
| tree | cc21c5717791c51a581d6248a39127f12933c1e6 /src | |
| parent | ce42ff9cf74ebb8d4b68bc78c95e90ea3db02b78 (diff) | |
| download | minetest-f64a6259b2b5e79103cfd4bc151304e6da39bca9.tar.gz minetest-f64a6259b2b5e79103cfd4bc151304e6da39bca9.tar.bz2 minetest-f64a6259b2b5e79103cfd4bc151304e6da39bca9.zip | |
Fix a m_camera not used warning fix pointed by clang
Diffstat (limited to 'src')
| -rw-r--r-- | src/content_cao.cpp | 3 | ||||
| -rw-r--r-- | 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 @@ private: // 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 @@ public: float time_from_last_punch=1000000); std::string debugInfoText(); - + std::string infoText() { return m_prop.infotext; |