diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-22 14:40:13 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-22 14:40:13 +0200 |
commit | fd09071c29452bdfea2c519f0defbffebee42f4c (patch) | |
tree | 44d2d9d59d4c98204cb1d60bf101414bfc45b708 /src/object/object.h | |
parent | 37e7c73f439c0d8cbfd0f1c02b7ef5916fd748ae (diff) | |
download | colobot-fd09071c29452bdfea2c519f0defbffebee42f4c.tar.gz colobot-fd09071c29452bdfea2c519f0defbffebee42f4c.tar.bz2 colobot-fd09071c29452bdfea2c519f0defbffebee42f4c.zip |
Data dir paths
- changed access to paths in data directory in CApplication
- models now load from data directory
Diffstat (limited to 'src/object/object.h')
-rw-r--r-- | src/object/object.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/object/object.h b/src/object/object.h index 1301768..b555856 100644 --- a/src/object/object.h +++ b/src/object/object.h @@ -21,11 +21,14 @@ #include "graphics/engine/engine.h" #include "graphics/engine/camera.h" -#include "sound/sound.h" + #include "object/object_ids.h" +#include "sound/sound.h" + class CInstanceManager; +class CApplication; class CPhysics; class CBrain; class CMotion; @@ -407,6 +410,8 @@ public: float GetTraceWidth(); void SetTraceWidth(float width); + std::string GetModelDirName(); + protected: bool EventFrame(const Event &event); void VirusFrame(float rTime); @@ -422,6 +427,7 @@ protected: protected: CInstanceManager* m_iMan; + CApplication* m_app; Gfx::CEngine* m_engine; Gfx::CLightManager* m_lightMan; Gfx::CTerrain* m_terrain; |