immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused variable

master
Piotr Dziwinski 2015-07-10 19:53:32 +02:00
parent 93479af188
commit 0dfbb00491
5 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/object/object_factory.cpp
View File

@ -71,13 +71,11 @@ using COldObjectUPtr = std::unique_ptr<COldObject>;
CObjectFactory::CObjectFactory(Gfx::CEngine* engine, CObjectFactory::CObjectFactory(Gfx::CEngine* engine,
Gfx::CTerrain* terrain, Gfx::CTerrain* terrain,
Gfx::COldModelManager* modelManager, Gfx::COldModelManager* modelManager,
Gfx::CParticle* particle, Gfx::CParticle* particle)
CRobotMain* main)
: m_engine(engine) : m_engine(engine)
, m_terrain(terrain) , m_terrain(terrain)
, m_modelManager(modelManager) , m_modelManager(modelManager)
, m_particle(particle) , m_particle(particle)
, m_main(main)
{} {}
CObjectUPtr CObjectFactory::CreateObject(const ObjectCreateParams& params) CObjectUPtr CObjectFactory::CreateObject(const ObjectCreateParams& params)

5
src/object/object_factory.h
View File

@ -39,7 +39,6 @@ class CTerrain;
class CObject; class CObject;
class COldObject; class COldObject;
class CRobotMain;
struct ObjectCreateParams; struct ObjectCreateParams;
using CObjectUPtr = std::unique_ptr<CObject>; using CObjectUPtr = std::unique_ptr<CObject>;
@ -50,8 +49,7 @@ public:
CObjectFactory(Gfx::CEngine* engine, CObjectFactory(Gfx::CEngine* engine,
Gfx::CTerrain* terrain, Gfx::CTerrain* terrain,
Gfx::COldModelManager* modelManager, Gfx::COldModelManager* modelManager,
Gfx::CParticle* particle, Gfx::CParticle* particle);
CRobotMain* main);
CObjectUPtr CreateObject(const ObjectCreateParams& params); CObjectUPtr CreateObject(const ObjectCreateParams& params);
@ -76,5 +74,4 @@ private:
Gfx::CTerrain* m_terrain; Gfx::CTerrain* m_terrain;
Gfx::COldModelManager* m_modelManager; Gfx::COldModelManager* m_modelManager;
Gfx::CParticle* m_particle; Gfx::CParticle* m_particle;
CRobotMain* m_main;
}; };

5
src/object/object_manager.cpp
View File

@ -39,9 +39,8 @@ template<> CObjectManager* CSingleton<CObjectManager>::m_instance = nullptr;
CObjectManager::CObjectManager(Gfx::CEngine* engine, CObjectManager::CObjectManager(Gfx::CEngine* engine,
Gfx::CTerrain* terrain, Gfx::CTerrain* terrain,
Gfx::COldModelManager* modelManager, Gfx::COldModelManager* modelManager,
Gfx::CParticle* particle, Gfx::CParticle* particle)
CRobotMain* main) : m_objectFactory(new CObjectFactory(engine, terrain, modelManager, particle))
: m_objectFactory(new CObjectFactory(engine, terrain, modelManager, particle, main))
, m_nextId(0) , m_nextId(0)
{ {
} }

4
src/object/object_manager.h
View File

@ -43,7 +43,6 @@ class CTerrain;
} // namespace Gfx } // namespace Gfx
class CObject; class CObject;
class CRobotMain;
class CObjectFactory; class CObjectFactory;
enum RadarFilter enum RadarFilter
@ -123,8 +122,7 @@ public:
CObjectManager(Gfx::CEngine* engine, CObjectManager(Gfx::CEngine* engine,
Gfx::CTerrain* terrain, Gfx::CTerrain* terrain,
Gfx::COldModelManager* modelManager, Gfx::COldModelManager* modelManager,
Gfx::CParticle* particle, Gfx::CParticle* particle);
CRobotMain* main);
virtual ~CObjectManager(); virtual ~CObjectManager();
//! Creates an object //! Creates an object

3
src/object/robotmain.cpp
View File

@ -275,8 +275,7 @@ void CRobotMain::Create(bool loadProfile)
m_objMan = new CObjectManager(m_engine, m_objMan = new CObjectManager(m_engine,
m_terrain, m_terrain,
m_modelManager, m_modelManager,
m_particle, m_particle);
this);
m_engine->SetTerrain(m_terrain); m_engine->SetTerrain(m_terrain);