Forgotten fix in dev-graphics

1 files changed, 39 insertions, 35 deletions

diff --git a/src/object/motion/motion.h b/src/object/motion/motion.h
index 9828283..d195e65 100644
--- a/src/object/motion/motion.h
+++ b/src/object/motion/motion.h
@@ -20,22 +20,26 @@
 
 
 #include "common/event.h"
-#include "common/misc.h"
+#include "common/global.h"
 #include "object/object.h"
 
 
 class CInstanceManager;
-class CD3DEngine;
+
+namespace Gfx {
+class CEngine;
 class CLight;
-class CParticule;
+class CParticle;
 class CTerrain;
 class CWater;
 class CCamera;
+}
+
 class CBrain;
 class CPhysics;
 class CObject;
 class CRobotMain;
-class CSound;
+class CSoundInterface;
 
 
 class CMotion
@@ -47,44 +51,44 @@ public:
     void    SetPhysics(CPhysics* physics);
     void    SetBrain(CBrain* brain);
 
-    virtual void    DeleteObject(bool bAll=false);
-    virtual bool    Create(Math::Vector pos, float angle, ObjectType type, float power);
-    virtual bool    EventProcess(const Event &event);
-    virtual Error   SetAction(int action, float time=0.2f);
-    virtual int     RetAction();
+    virtual void            DeleteObject(bool bAll=false);
+    virtual bool            Create(Math::Vector pos, float angle, ObjectType type, float power);
+    virtual bool            EventProcess(const Event &event);
+    virtual Error           SetAction(int action, float time=0.2f);
+    virtual int             GetAction();
 
-    virtual bool    SetParam(int rank, float value);
-    virtual float   RetParam(int rank);
+    virtual bool            SetParam(int rank, float value);
+    virtual float           GetParam(int rank);
 
-    virtual bool    Write(char *line);
-    virtual bool    Read(char *line);
+    virtual bool            Write(char *line);
+    virtual bool            Read(char *line);
 
-    virtual void        SetLinVibration(Math::Vector dir);
-    virtual Math::Vector    RetLinVibration();
-    virtual void        SetCirVibration(Math::Vector dir);
-    virtual Math::Vector    RetCirVibration();
-    virtual void        SetInclinaison(Math::Vector dir);
-    virtual Math::Vector    RetInclinaison();
+    virtual void            SetLinVibration(Math::Vector dir);
+    virtual Math::Vector    GetLinVibration();
+    virtual void            SetCirVibration(Math::Vector dir);
+    virtual Math::Vector    GetCirVibration();
+    virtual void            SetInclinaison(Math::Vector dir);
+    virtual Math::Vector    GetInclinaison();
 
 protected:
 
 protected:
-    CInstanceManager* m_iMan;
-    CD3DEngine*     m_engine;
-    CLight*         m_light;
-    CParticule*     m_particule;
-    CTerrain*       m_terrain;
-    CWater*         m_water;
-    CCamera*        m_camera;
-    CObject*        m_object;
-    CBrain*         m_brain;
-    CPhysics*       m_physics;
-    CRobotMain*     m_main;
-    CSound*         m_sound;
-
-    int             m_actionType;
-    float           m_actionTime;
-    float           m_progress;
+    CInstanceManager*   m_iMan;
+    Gfx::CEngine*       m_engine;
+    Gfx::CLight*        m_light;
+    Gfx::CParticle*     m_particle;
+    Gfx::CTerrain*      m_terrain;
+    Gfx::CWater*        m_water;
+    Gfx::CCamera*       m_camera;
+    CObject*            m_object;
+    CBrain*             m_brain;
+    CPhysics*           m_physics;
+    CRobotMain*         m_main;
+    CSoundInterface*    m_sound;
+
+    int                 m_actionType;
+    float               m_actionTime;
+    float               m_progress;
 
     Math::Vector        m_linVibration;     // linear vibration
     Math::Vector        m_cirVibration;     // circular vibration