Merge branch 'dev-object' into dev

Conflicts:
	src/object/robotmain.cpp
	src/object/robotmain.h

1 files changed, 6 insertions, 11 deletions

diff --git a/src/object/mainmovie.h b/src/object/mainmovie.h
index 0c8d51c..27e4df3 100644
--- a/src/object/mainmovie.h
+++ b/src/object/mainmovie.h
@@ -24,17 +24,14 @@
 
 
 class CInstanceManager;
-class CEvent;
-class CInterface;
 class CRobotMain;
-class CCamera;
 class CSoundInterface;
 
 namespace Gfx
 {
+    class CCamera;
     class CEngine;
-} /* Gfx */ 
-
+};
 
 enum MainMovieType
 {
@@ -56,18 +53,16 @@ public:
     bool            Stop();
     bool            IsExist();
     bool            EventProcess(const Event &event);
-    MainMovieType   RetType();
-    MainMovieType   RetStopType();
+    MainMovieType   GetType();
+    MainMovieType   GetStopType();
 
 protected:
 
 protected:
-    CInstanceManager* m_iMan;
-    CEvent*             m_event;
+    CInstanceManager*   m_iMan;
     Gfx::CEngine*       m_engine;
-    CInterface*         m_interface;
     CRobotMain*         m_main;
-    CCamera*            m_camera;
+    Gfx::CCamera*       m_camera;
     CSoundInterface*    m_sound;
 
     MainMovieType       m_type;