summaryrefslogtreecommitdiffstats
path: root/src/object/motion/motion.cpp
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-09-22 14:40:13 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-09-22 14:40:13 +0200
commitfd09071c29452bdfea2c519f0defbffebee42f4c (patch)
tree44d2d9d59d4c98204cb1d60bf101414bfc45b708 /src/object/motion/motion.cpp
parent37e7c73f439c0d8cbfd0f1c02b7ef5916fd748ae (diff)
downloadcolobot-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/motion/motion.cpp')
-rw-r--r--src/object/motion/motion.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/object/motion/motion.cpp b/src/object/motion/motion.cpp
index df8a4be..ff038ae 100644
--- a/src/object/motion/motion.cpp
+++ b/src/object/motion/motion.cpp
@@ -14,14 +14,16 @@
// * You should have received a copy of the GNU General Public License
// * along with this program. If not, see http://www.gnu.org/licenses/.
-// motion.cpp
-
#include "object/motion/motion.h"
+#include "app/app.h"
+
#include "common/iman.h"
+
#include "script/cmdtoken.h"
+
#include <stdio.h>
#include <string.h>
@@ -33,9 +35,10 @@ CMotion::CMotion(CInstanceManager* iMan, CObject* object)
m_iMan = iMan;
m_iMan->AddInstance(CLASS_MOTION, this, 100);
+ m_app = CApplication::GetInstancePointer();
m_engine = static_cast< Gfx::CEngine* >(m_iMan->SearchInstance(CLASS_ENGINE));
m_light = static_cast< Gfx::CLight* >(m_iMan->SearchInstance(CLASS_LIGHT));
- m_particle = static_cast< Gfx::CParticle* >(m_iMan->SearchInstance(CLASS_PARTICULE));
+ m_particle = static_cast< Gfx::CParticle* >(m_iMan->SearchInstance(CLASS_PARTICULE));
m_terrain = static_cast< Gfx::CTerrain* >(m_iMan->SearchInstance(CLASS_TERRAIN));
m_water = static_cast< Gfx::CWater* >(m_iMan->SearchInstance(CLASS_WATER));
m_camera = static_cast< Gfx::CCamera* >(m_iMan->SearchInstance(CLASS_CAMERA));