diff options
author | Piotr Dziwiński <piotr.dziwinski@nsn.com> | 2013-02-16 22:37:43 +0100 |
---|---|---|
committer | Piotr Dziwiński <piotr.dziwinski@nsn.com> | 2013-02-17 12:11:56 +0100 |
commit | 001d37b257b126dd6ef1dced70f94ff3d2806d28 (patch) | |
tree | 1025979c635c899f196d606f7d74170e33ef4f3a /src/physics/physics.h | |
parent | 45040318b026f8864d244e39f1703685ad688470 (diff) | |
download | colobot-001d37b257b126dd6ef1dced70f94ff3d2806d28.tar.gz colobot-001d37b257b126dd6ef1dced70f94ff3d2806d28.tar.bz2 colobot-001d37b257b126dd6ef1dced70f94ff3d2806d28.zip |
CInstanceManager refactoring
* removed classes managed by CInstanceManager
except for CObject, CPyro, CBrain and CPhysics
because of dependencies
* refactored instance searching to use existing singleton instances of
CApplication, CEngine and CRobotMain and calling their getter
functions
Diffstat (limited to 'src/physics/physics.h')
-rw-r--r-- | src/physics/physics.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/physics/physics.h b/src/physics/physics.h index db88e8c..cce57f3 100644 --- a/src/physics/physics.h +++ b/src/physics/physics.h @@ -30,21 +30,19 @@ #include "math/vector.h" -class CInstanceManager; class CObject; class CBrain; class CMotion; class CSoundInterface; -namespace Gfx -{ +namespace Gfx { class CCamera; class CEngine; class CLight; class CParticle; class CTerrain; class CWater; -}; +} enum PhysicsType @@ -97,7 +95,7 @@ struct Motion class CPhysics { public: - CPhysics(CInstanceManager* iMan, CObject* object); + CPhysics(CObject* object); ~CPhysics(); void DeleteObject(bool bAll=false); @@ -195,7 +193,6 @@ protected: void WheelParticle(int color, float width); protected: - CInstanceManager* m_iMan; Gfx::CEngine* m_engine; Gfx::CLightManager* m_lightMan; Gfx::CParticle* m_particle; |