Merge with changes from Zaba999 fork.

1 files changed, 73 insertions, 74 deletions

diff --git a/src/object/robotmain.h b/src/object/robotmain.h
index 559453b..1370cd6 100644
--- a/src/object/robotmain.h
+++ b/src/object/robotmain.h
@@ -22,12 +22,11 @@
 #include <stdio.h>
 
 #include "common/misc.h"
-#include "old/d3dengine.h"
+#include "graphics/engine/engine.h"
 #include "object/object.h"
 #include "object/mainmovie.h"
-#include "old/camera.h"
-#include "old/particule.h"
-
+#include "graphics/engine/camera.h"
+#include "graphics/engine/particle.h"
 
 enum Phase
 {
@@ -86,7 +85,7 @@ class CWindow;
 class CControl;
 class CDisplayText;
 class CDisplayInfo;
-class CSound;
+class CSoundInterface;
 
 
 struct EndTake
@@ -154,25 +153,25 @@ public:
     void        ScenePerso();
 
     void        SetMovieLock(bool bLock);
-    bool        RetMovieLock();
-    bool        RetInfoLock();
+    bool        GetMovieLock();
+    bool        GetInfoLock();
     void        SetSatComLock(bool bLock);
-    bool        RetSatComLock();
+    bool        GetSatComLock();
     void        SetEditLock(bool bLock, bool bEdit);
-    bool        RetEditLock();
+    bool        GetEditLock();
     void        SetEditFull(bool bFull);
-    bool        RetEditFull();
-    bool        RetFreePhoto();
+    bool        GetEditFull();
+    bool        GetFreePhoto();
     void        SetFriendAim(bool bFriend);
-    bool        RetFriendAim();
+    bool        GetFriendAim();
 
     void        SetTracePrecision(float factor);
-    float       RetTracePrecision();
+    float       GetTracePrecision();
 
     void        ChangePause(bool bPause);
 
     void        SetSpeed(float speed);
-    float       RetSpeed();
+    float       GetSpeed();
 
     void        UpdateShortcuts();
     void        SelectHuman();
@@ -180,75 +179,75 @@ public:
     CObject*    SearchToto();
     CObject*    SearchNearest(Math::Vector pos, CObject* pExclu);
     bool        SelectObject(CObject* pObj, bool bDisplayError=true);
-    CObject*    RetSelectObject();
+    CObject*    GetSelectObject();
     CObject*    DeselectAll();
     bool        DeleteObject();
 
     void        ResetObject();
     void        ResetCreate();
     Error       CheckEndMission(bool bFrame);
-    void        CheckEndMessage(char *message);
-    int         RetObligatoryToken();
-    char*       RetObligatoryToken(int i);
-    int         IsObligatoryToken(char *token);
-    bool        IsProhibitedToken(char *token);
+    void        CheckEndMessage(const char *message);
+    int         GetObligatoryToken();
+    char*       GetObligatoryToken(int i);
+    int         IsObligatoryToken(const char *token);
+    bool        IsProhibitedToken(const char *token);
     void        UpdateMap();
-    bool        RetShowMap();
+    bool        GetShowMap();
 
-    MainMovieType RetMainMovie();
+    MainMovieType GetMainMovie();
 
     void        FlushDisplayInfo();
     void        StartDisplayInfo(int index, bool bMovie);
     void        StartDisplayInfo(char *filename, int index);
     void        StopDisplayInfo();
-    char*       RetDisplayInfoName(int index);
-    int         RetDisplayInfoPosition(int index);
+    char*       GetDisplayInfoName(int index);
+    int         GetDisplayInfoPosition(int index);
     void        SetDisplayInfoPosition(int index, int pos);
 
     void        StartSuspend();
     void        StopSuspend();
 
-    float       RetGameTime();
+    float       GetGameTime();
 
     void        SetFontSize(float size);
-    float       RetFontSize();
+    float       GetFontSize();
     void        SetWindowPos(Math::Point pos);
-    Math::Point     RetWindowPos();
+    Math::Point     GetWindowPos();
     void        SetWindowDim(Math::Point dim);
-    Math::Point     RetWindowDim();
+    Math::Point     GetWindowDim();
 
     void        SetIOPublic(bool bMode);
-    bool        RetIOPublic();
+    bool        GetIOPublic();
     void        SetIOPos(Math::Point pos);
-    Math::Point     RetIOPos();
+    Math::Point     GetIOPos();
     void        SetIODim(Math::Point dim);
-    Math::Point     RetIODim();
-
-    char*       RetTitle();
-    char*       RetResume();
-    char*       RetScriptName();
-    char*       RetScriptFile();
-    bool        RetTrainerPilot();
-    bool        RetFixScene();
-    bool        RetGlint();
-    bool        RetSoluce4();
-    bool        RetMovies();
-    bool        RetNiceReset();
-    bool        RetHimselfDamage();
-    bool        RetShowSoluce();
-    bool        RetSceneSoluce();
-    bool        RetShowAll();
-    bool        RetCheatRadar();
-    char*       RetSavegameDir();
-    char*       RetPublicDir();
-    char*       RetFilesDir();
+    Math::Point     GetIODim();
+
+    char*       GetTitle();
+    char*       GetResume();
+    char*       GetScriptName();
+    char*       GetScriptFile();
+    bool        GetTrainerPilot();
+    bool        GetFixScene();
+    bool        GetGlint();
+    bool        GetSoluce4();
+    bool        GetMovies();
+    bool        GetNiceReset();
+    bool        GetHimselfDamage();
+    bool        GetShowSoluce();
+    bool        GetSceneSoluce();
+    bool        GetShowAll();
+    bool        GetCheatRadar();
+    char*       GetSavegameDir();
+    char*       GetPublicDir();
+    char*       GetFilesDir();
 
     void        SetGamerName(char *name);
-    char*       RetGamerName();
-    int         RetGamerFace();
-    int         RetGamerGlasses();
-    bool        RetGamerOnlyHead();
-    float       RetPersoAngle();
+    char*       GetGamerName();
+    int         GetGamerFace();
+    int         GetGamerGlasses();
+    bool        GetGamerOnlyHead();
+    float       GetPersoAngle();
 
     void        StartMusic();
     void        ClearInterface();
@@ -256,11 +255,11 @@ public:
 
     float       SearchNearestObject(Math::Vector center, CObject *exclu);
     bool        FreeSpace(Math::Vector &center, float minRadius, float maxRadius, float space, CObject *exclu);
-    float       RetFlatZoneRadius(Math::Vector center, float maxRadius, CObject *exclu);
+    float       GetFlatZoneRadius(Math::Vector center, float maxRadius, CObject *exclu);
     void        HideDropZone(CObject* metal);
     void        ShowDropZone(CObject* metal, CObject* truck);
     void        FlushShowLimit(int i);
-    void        SetShowLimit(int i, ParticuleType parti, CObject *pObj, Math::Vector pos, float radius, float duration=SHOWLIMITTIME);
+    void        SetShowLimit(int i, Gfx::ParticleType parti, CObject *pObj, Math::Vector pos, float radius, float duration=SHOWLIMITTIME);
     void        AdjustShowLimit(int i, Math::Vector pos);
     void        StartShowLimit();
     void        FrameShowLimit(float rTime);
@@ -276,7 +275,7 @@ public:
 
     bool        FlushNewScriptName();
     bool        AddNewScriptName(ObjectType type, char *name);
-    char*       RetNewScriptName(ObjectType type, int rank);
+    char*       GetNewScriptName(ObjectType type, int rank);
 
     void        WriteFreeParam();
     void        ReadFreeParam();
@@ -287,7 +286,7 @@ public:
     void        IOWriteObject(FILE *file, CObject* pObj, char *cmd);
     CObject*    IOReadObject(char *line, char* filename, int objRank);
 
-    int         CreateSpot(Math::Vector pos, D3DCOLORVALUE color);
+    int         CreateSpot(Math::Vector pos, Gfx::Color color);
 
 protected:
     bool        EventFrame(const Event &event);
@@ -300,7 +299,7 @@ protected:
     void        CreateModel();
     Math::Vector    LookatPoint( Math::Vector eye, float angleH, float angleV, float length );
     CObject*    CreateObject(Math::Vector pos, float angle, float zoom, float height, ObjectType type, float power=1.0f, bool bTrainer=false, bool bToy=false, int option=0);
-    int         CreateLight(Math::Vector direction, D3DCOLORVALUE color);
+    int         CreateLight(Math::Vector direction, Gfx::Color color);
     void        HiliteClear();
     void        HiliteObject(Math::Point pos);
     void        HiliteFrame(float rTime);
@@ -309,7 +308,7 @@ protected:
     CObject*    DetectObject(Math::Point pos);
     void        ChangeCamera();
     void        RemoteCamera(float pan, float zoom, float rTime);
-    void        KeyCamera(EventMsg event, long param);
+    void        KeyCamera(EventType event, long param);
     void        AbortMovie();
     bool        IsSelectable(CObject* pObj);
     void        SelectOneObject(CObject* pObj, bool bDisplayError=true);
@@ -318,8 +317,8 @@ protected:
     void        DeleteAllObjects();
     void        UpdateInfoText();
     CObject*    SearchObject(ObjectType type);
-    CObject*    RetSelect();
-    void        StartDisplayVisit(EventMsg event);
+    CObject*    GetSelect();
+    void        StartDisplayVisit(EventType event);
     void        FrameVisit(float rTime);
     void        StopDisplayVisit();
     void        ExecuteCmd(char *cmd);
@@ -333,7 +332,7 @@ protected:
     CMainMap*       m_map;
     CEvent*         m_event;
     CD3DEngine*     m_engine;
-    CParticule*     m_particule;
+    Gfx::CParticle*     m_particle;
     CWater*         m_water;
     CCloud*         m_cloud;
     CBlitz*         m_blitz;
@@ -359,7 +358,7 @@ protected:
 
     Phase           m_phase;
     int             m_cameraRank;
-    D3DCOLORVALUE   m_color;
+    Gfx::Color      m_color;
     bool            m_bFreePhoto;
     bool            m_bCmdEdit;
     bool            m_bShowPos;
@@ -420,7 +419,7 @@ protected:
     float           m_cameraPan;
     float           m_cameraZoom;
 
-    EventMsg        m_visitLast;
+    EventType        m_visitLast;
     CObject*        m_visitObject;
     CObject*        m_visitArrow;
     float           m_visitTime;
@@ -446,14 +445,14 @@ protected:
 
     ShowLimit       m_showLimit[MAXSHOWLIMIT];
 
-    D3DCOLORVALUE   m_colorRefBot;
-    D3DCOLORVALUE   m_colorNewBot;
-    D3DCOLORVALUE   m_colorRefAlien;
-    D3DCOLORVALUE   m_colorNewAlien;
-    D3DCOLORVALUE   m_colorRefGreen;
-    D3DCOLORVALUE   m_colorNewGreen;
-    D3DCOLORVALUE   m_colorRefWater;
-    D3DCOLORVALUE   m_colorNewWater;
+    Gfx::Color   m_colorRefBot;
+    Gfx::Color   m_colorNewBot;
+    Gfx::Color   m_colorRefAlien;
+    Gfx::Color   m_colorNewAlien;
+    Gfx::Color   m_colorRefGreen;
+    Gfx::Color   m_colorNewGreen;
+    Gfx::Color   m_colorRefWater;
+    Gfx::Color   m_colorNewWater;
     float           m_colorShiftWater;
 };