summaryrefslogtreecommitdiffstats
path: root/src/object/mainmovie.h
diff options
context:
space:
mode:
authorPiotr Dziwiński <piotr.dziwinski@nsn.com>2013-02-16 22:37:43 +0100
committerPiotr Dziwiński <piotr.dziwinski@nsn.com>2013-02-17 12:11:56 +0100
commit001d37b257b126dd6ef1dced70f94ff3d2806d28 (patch)
tree1025979c635c899f196d606f7d74170e33ef4f3a /src/object/mainmovie.h
parent45040318b026f8864d244e39f1703685ad688470 (diff)
downloadcolobot-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/object/mainmovie.h')
-rw-r--r--src/object/mainmovie.h16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/object/mainmovie.h b/src/object/mainmovie.h
index eba21eb..4554431 100644
--- a/src/object/mainmovie.h
+++ b/src/object/mainmovie.h
@@ -23,18 +23,17 @@
#include "common/event.h"
+
#include "math/vector.h"
-class CInstanceManager;
class CRobotMain;
class CSoundInterface;
-namespace Gfx
-{
- class CCamera;
- class CEngine;
-};
+namespace Gfx {
+class CCamera;
+class CEngine;
+}
enum MainMovieType
{
@@ -48,7 +47,7 @@ enum MainMovieType
class CMainMovie
{
public:
- CMainMovie(CInstanceManager* iMan);
+ CMainMovie();
~CMainMovie();
void Flush();
@@ -60,9 +59,6 @@ public:
MainMovieType GetStopType();
protected:
-
-protected:
- CInstanceManager* m_iMan;
Gfx::CEngine* m_engine;
CRobotMain* m_main;
Gfx::CCamera* m_camera;