From 191fdc614ed8022c145d3530f9d412e715ae37db Mon Sep 17 00:00:00 2001 From: Zaba999 Date: Thu, 20 Sep 2012 22:58:00 +0200 Subject: changed paths for models and levels. Now it's possible to load level. --- src/CBot/CBot.cpp | 4 +- src/CBot/CBot.h | 5 +- src/CMakeLists.txt | 2 + src/graphics/engine/engine.cpp | 6 +- src/object/motion/motionant.cpp | 42 ++-- src/object/motion/motionbee.cpp | 46 ++-- src/object/motion/motionhuman.cpp | 44 ++-- src/object/motion/motionmother.cpp | 40 ++-- src/object/motion/motionspider.cpp | 12 +- src/object/motion/motiontoto.cpp | 20 +- src/object/motion/motionvehicle.cpp | 152 ++++++------ src/object/motion/motionworm.cpp | 8 +- src/object/object.cpp | 466 ++++++++++++++++++------------------ src/ui/maindialog.cpp | 73 +++--- 14 files changed, 467 insertions(+), 453 deletions(-) diff --git a/src/CBot/CBot.cpp b/src/CBot/CBot.cpp index 3a7c828..ed6831d 100644 --- a/src/CBot/CBot.cpp +++ b/src/CBot/CBot.cpp @@ -341,7 +341,7 @@ bool CBotInstr::CompCase(CBotStack* &pj, int val) // compiles a statement block " { i ; i ; } " // this class have no constructor because there is never an instance of this -// class (TODO what about default constructor?) +// class // the object returned by Compile is usually of type CBotListInstr @@ -3082,8 +3082,6 @@ CBotInstr* CBotExprVar::Compile(CBotToken* &p, CBotCStack* pStack, int privat) // This is an element of the current class // ads the equivalent of this. before - /// \TODO need to be fixed revised and fixed after adding unit - ///tests CBotToken token("this"); inst->SetToken(&token); (static_cast(inst))->m_nIdent = -2; // identificator for this diff --git a/src/CBot/CBot.h b/src/CBot/CBot.h index 53a5633..8886308 100644 --- a/src/CBot/CBot.h +++ b/src/CBot/CBot.h @@ -1009,13 +1009,14 @@ public: // an instruction block { .... } class CBotBlock : public CBotInstr { -private: - public: static CBotInstr* Compile(CBotToken* &p, CBotCStack* pStack, bool bLocal = true); static CBotInstr* CompileBlkOrInst(CBotToken* &p, CBotCStack* pStack, bool bLocal = false); +private: + CBotBlock(); + CBotBlock(const CBotBlock &); }; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 197438c..d11d6b0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -188,6 +188,7 @@ ${OPENGL_LIBRARY} ${PNG_LIBRARIES} ${OPTIONAL_LIBS} ${PLATFORM_LIBS} +${Boost_LIBRARIES} CBot ) @@ -200,6 +201,7 @@ ${SDL_IMAGE_INCLUDE_DIR} ${SDLTTF_INCLUDE_DIR} ${PNG_INCLUDE_DIRS} ${OPTIONAL_INCLUDE_DIRS} +${Boost_INCLUDE_DIRS} .. ) diff --git a/src/graphics/engine/engine.cpp b/src/graphics/engine/engine.cpp index bd5f60f..86554e5 100644 --- a/src/graphics/engine/engine.cpp +++ b/src/graphics/engine/engine.cpp @@ -2790,9 +2790,9 @@ void Gfx::CEngine::Draw3DScene() m_device->SetRenderState(Gfx::RENDER_STATE_DEPTH_TEST, true); m_device->SetRenderState(Gfx::RENDER_STATE_LIGHTING, true); m_device->SetRenderState(Gfx::RENDER_STATE_FOG, true); - - float fogStart = m_deepView[m_rankView]*m_fogStart[m_rankView]; - float fogEnd = m_deepView[m_rankView]; +// +// float fogStart = m_deepView[m_rankView]*m_fogStart[m_rankView]; +// float fogEnd = m_deepView[m_rankView]; m_device->SetFogParams(Gfx::FOG_LINEAR, m_fogColor[m_rankView], fogStart, fogEnd, 1.0f); m_device->SetTransform(Gfx::TRANSFORM_PROJECTION, m_matProj); diff --git a/src/object/motion/motionant.cpp b/src/object/motion/motionant.cpp index 6259856..da7880f 100644 --- a/src/object/motion/motionant.cpp +++ b/src/object/motion/motionant.cpp @@ -82,7 +82,7 @@ bool CMotionAnt::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_VEHICULE); // this is a moving object m_object->SetObjectRank(0, rank); - pModFile->ReadModel("objects\\ant1.mod"); + pModFile->ReadModel("data/models/ant1.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(0, pos); @@ -98,7 +98,7 @@ bool CMotionAnt::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank,Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(1, rank); m_object->SetObjectParent(1, 0); - pModFile->ReadModel("objects\\ant2.mod"); + pModFile->ReadModel("data/models/ant2.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(1, Math::Vector(2.0f, 0.0f, 0.0f)); @@ -107,7 +107,7 @@ bool CMotionAnt::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank,Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(2, rank); m_object->SetObjectParent(2, 0); - pModFile->ReadModel("objects\\ant3.mod"); + pModFile->ReadModel("data/models/ant3.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(2, Math::Vector(-1.0f, 0.0f, 0.0f)); @@ -116,7 +116,7 @@ bool CMotionAnt::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank,Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(3, rank); m_object->SetObjectParent(3, 0); - pModFile->ReadModel("objects\\ant4.mod"); + pModFile->ReadModel("data/models/ant4.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(3, Math::Vector(-0.4f, -0.1f, -0.3f)); @@ -125,7 +125,7 @@ bool CMotionAnt::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank,Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(4, rank); m_object->SetObjectParent(4, 3); - pModFile->ReadModel("objects\\ant5.mod"); + pModFile->ReadModel("data/models/ant5.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(4, Math::Vector(0.0f, 0.0f, -1.0f)); @@ -134,7 +134,7 @@ bool CMotionAnt::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank,Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(5, rank); m_object->SetObjectParent(5, 4); - pModFile->ReadModel("objects\\ant6.mod"); + pModFile->ReadModel("data/models/ant6.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(5, Math::Vector(0.0f, 0.0f, -2.0f)); @@ -143,7 +143,7 @@ bool CMotionAnt::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank,Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(6, rank); m_object->SetObjectParent(6, 0); - pModFile->ReadModel("objects\\ant4.mod"); + pModFile->ReadModel("data/models/ant4.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(6, Math::Vector(0.1f, -0.1f, -0.4f)); @@ -152,7 +152,7 @@ bool CMotionAnt::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank,Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(7, rank); m_object->SetObjectParent(7, 6); - pModFile->ReadModel("objects\\ant5.mod"); + pModFile->ReadModel("data/models/ant5.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(7, Math::Vector(0.0f, 0.0f, -1.0f)); @@ -161,7 +161,7 @@ bool CMotionAnt::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank,Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(8, rank); m_object->SetObjectParent(8, 7); - pModFile->ReadModel("objects\\ant6.mod"); + pModFile->ReadModel("data/models/ant6.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(8, Math::Vector(0.0f, 0.0f, -2.0f)); @@ -170,7 +170,7 @@ bool CMotionAnt::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank,Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(9, rank); m_object->SetObjectParent(9, 0); - pModFile->ReadModel("objects\\ant4.mod"); + pModFile->ReadModel("data/models/ant4.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(9, Math::Vector(1.4f, -0.1f, -0.6f)); @@ -179,7 +179,7 @@ bool CMotionAnt::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank,Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(10, rank); m_object->SetObjectParent(10, 9); - pModFile->ReadModel("objects\\ant5.mod"); + pModFile->ReadModel("data/models/ant5.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(10, Math::Vector(0.0f, 0.0f, -1.0f)); @@ -188,7 +188,7 @@ bool CMotionAnt::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank,Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(11, rank); m_object->SetObjectParent(11, 10); - pModFile->ReadModel("objects\\ant6.mod"); + pModFile->ReadModel("data/models/ant6.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(11, Math::Vector(0.0f, 0.0f, -2.0f)); @@ -197,7 +197,7 @@ bool CMotionAnt::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank,Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(12, rank); m_object->SetObjectParent(12, 0); - pModFile->ReadModel("objects\\ant4.mod"); + pModFile->ReadModel("data/models/ant4.mod"); pModFile->Mirror(); pModFile->CreateEngineObject(rank); m_object->SetPosition(12, Math::Vector(-0.4f, -0.1f, 0.3f)); @@ -207,7 +207,7 @@ bool CMotionAnt::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank,Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(13, rank); m_object->SetObjectParent(13, 12); - pModFile->ReadModel("objects\\ant5.mod"); + pModFile->ReadModel("data/models/ant5.mod"); pModFile->Mirror(); pModFile->CreateEngineObject(rank); m_object->SetPosition(13, Math::Vector(0.0f, 0.0f, 1.0f)); @@ -217,7 +217,7 @@ bool CMotionAnt::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank,Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(14, rank); m_object->SetObjectParent(14, 13); - pModFile->ReadModel("objects\\ant6.mod"); + pModFile->ReadModel("data/models/ant6.mod"); pModFile->Mirror(); pModFile->CreateEngineObject(rank); m_object->SetPosition(14, Math::Vector(0.0f, 0.0f, 2.0f)); @@ -227,7 +227,7 @@ bool CMotionAnt::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank,Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(15, rank); m_object->SetObjectParent(15, 0); - pModFile->ReadModel("objects\\ant4.mod"); + pModFile->ReadModel("data/models/ant4.mod"); pModFile->Mirror(); pModFile->CreateEngineObject(rank); m_object->SetPosition(15, Math::Vector(0.1f, -0.1f, 0.4f)); @@ -237,7 +237,7 @@ bool CMotionAnt::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank,Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(16, rank); m_object->SetObjectParent(16, 15); - pModFile->ReadModel("objects\\ant5.mod"); + pModFile->ReadModel("data/models/ant5.mod"); pModFile->Mirror(); pModFile->CreateEngineObject(rank); m_object->SetPosition(16, Math::Vector(0.0f, 0.0f, 1.0f)); @@ -247,7 +247,7 @@ bool CMotionAnt::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank,Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(17, rank); m_object->SetObjectParent(17, 16); - pModFile->ReadModel("objects\\ant6.mod"); + pModFile->ReadModel("data/models/ant6.mod"); pModFile->Mirror(); pModFile->CreateEngineObject(rank); m_object->SetPosition(17, Math::Vector(0.0f, 0.0f, 2.0f)); @@ -257,7 +257,7 @@ bool CMotionAnt::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank,Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(18, rank); m_object->SetObjectParent(18, 0); - pModFile->ReadModel("objects\\ant4.mod"); + pModFile->ReadModel("data/models/ant4.mod"); pModFile->Mirror(); pModFile->CreateEngineObject(rank); m_object->SetPosition(18, Math::Vector(1.4f, -0.1f, 0.6f)); @@ -267,7 +267,7 @@ bool CMotionAnt::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank,Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(19, rank); m_object->SetObjectParent(19, 18); - pModFile->ReadModel("objects\\ant5.mod"); + pModFile->ReadModel("data/models/ant5.mod"); pModFile->Mirror(); pModFile->CreateEngineObject(rank); m_object->SetPosition(19, Math::Vector(0.0f, 0.0f, 1.0f)); @@ -277,7 +277,7 @@ bool CMotionAnt::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank,Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(20, rank); m_object->SetObjectParent(20, 19); - pModFile->ReadModel("objects\\ant6.mod"); + pModFile->ReadModel("data/models/ant6.mod"); pModFile->Mirror(); pModFile->CreateEngineObject(rank); m_object->SetPosition(20, Math::Vector(0.0f, 0.0f, 2.0f)); diff --git a/src/object/motion/motionbee.cpp b/src/object/motion/motionbee.cpp index c679876..026be7a 100644 --- a/src/object/motion/motionbee.cpp +++ b/src/object/motion/motionbee.cpp @@ -80,7 +80,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_VEHICULE); // this is a moving object m_object->SetObjectRank(0, rank); - pModFile->ReadModel("objects\\bee1.mod"); + pModFile->ReadModel("data/models/bee1.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(0, pos); @@ -96,7 +96,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(1, rank); m_object->SetObjectParent(1, 0); - pModFile->ReadModel("objects\\bee2.mod"); + pModFile->ReadModel("data/models/bee2.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(1, Math::Vector(1.6f, 0.3f, 0.0f)); @@ -105,7 +105,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(2, rank); m_object->SetObjectParent(2, 0); - pModFile->ReadModel("objects\\bee3.mod"); + pModFile->ReadModel("data/models/bee3.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(2, Math::Vector(-0.8f, 0.0f, 0.0f)); @@ -114,7 +114,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(3, rank); m_object->SetObjectParent(3, 0); - pModFile->ReadModel("objects\\ant4.mod"); + pModFile->ReadModel("data/models/ant4.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(3, Math::Vector(-0.3f, -0.1f, -0.2f)); @@ -123,7 +123,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(4, rank); m_object->SetObjectParent(4, 3); - pModFile->ReadModel("objects\\ant5.mod"); + pModFile->ReadModel("data/models/ant5.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(4, Math::Vector(0.0f, 0.0f, -1.0f)); @@ -132,7 +132,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(5, rank); m_object->SetObjectParent(5, 4); - pModFile->ReadModel("objects\\ant6.mod"); + pModFile->ReadModel("data/models/ant6.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(5, Math::Vector(0.0f, 0.0f, -2.0f)); @@ -141,7 +141,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(6, rank); m_object->SetObjectParent(6, 0); - pModFile->ReadModel("objects\\ant4.mod"); + pModFile->ReadModel("data/models/ant4.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(6, Math::Vector(0.3f, -0.1f, -0.4f)); @@ -150,7 +150,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(7, rank); m_object->SetObjectParent(7, 6); - pModFile->ReadModel("objects\\ant5.mod"); + pModFile->ReadModel("data/models/ant5.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(7, Math::Vector(0.0f, 0.0f, -1.0f)); @@ -159,7 +159,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(8, rank); m_object->SetObjectParent(8, 7); - pModFile->ReadModel("objects\\ant6.mod"); + pModFile->ReadModel("data/models/ant6.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(8, Math::Vector(0.0f, 0.0f, -2.0f)); @@ -168,7 +168,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(9, rank); m_object->SetObjectParent(9, 0); - pModFile->ReadModel("objects\\ant4.mod"); + pModFile->ReadModel("data/models/ant4.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(9, Math::Vector(1.0f, -0.1f, -0.7f)); @@ -177,7 +177,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(10, rank); m_object->SetObjectParent(10, 9); - pModFile->ReadModel("objects\\ant5.mod"); + pModFile->ReadModel("data/models/ant5.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(10, Math::Vector(0.0f, 0.0f, -1.0f)); @@ -186,7 +186,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(11, rank); m_object->SetObjectParent(11, 10); - pModFile->ReadModel("objects\\ant6.mod"); + pModFile->ReadModel("data/models/ant6.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(11, Math::Vector(0.0f, 0.0f, -2.0f)); @@ -195,7 +195,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(12, rank); m_object->SetObjectParent(12, 0); - pModFile->ReadModel("objects\\ant4.mod"); + pModFile->ReadModel("data/models/ant4.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(12, Math::Vector(-0.3f, -0.1f, 0.2f)); m_object->SetAngleY(12, Math::PI); @@ -205,7 +205,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(13, rank); m_object->SetObjectParent(13, 12); - pModFile->ReadModel("objects\\ant5.mod"); + pModFile->ReadModel("data/models/ant5.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(13, Math::Vector(0.0f, 0.0f, -1.0f)); @@ -214,7 +214,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(14, rank); m_object->SetObjectParent(14, 13); - pModFile->ReadModel("objects\\ant6.mod"); + pModFile->ReadModel("data/models/ant6.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(14, Math::Vector(0.0f, 0.0f, -2.0f)); @@ -223,7 +223,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(15, rank); m_object->SetObjectParent(15, 0); - pModFile->ReadModel("objects\\ant4.mod"); + pModFile->ReadModel("data/models/ant4.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(15, Math::Vector(0.3f, -0.1f, 0.4f)); m_object->SetAngleY(15, Math::PI); @@ -233,7 +233,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(16, rank); m_object->SetObjectParent(16, 15); - pModFile->ReadModel("objects\\ant5.mod"); + pModFile->ReadModel("data/models/ant5.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(16, Math::Vector(0.0f, 0.0f, -1.0f)); @@ -242,7 +242,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(17, rank); m_object->SetObjectParent(17, 16); - pModFile->ReadModel("objects\\ant6.mod"); + pModFile->ReadModel("data/models/ant6.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(17, Math::Vector(0.0f, 0.0f, -2.0f)); @@ -251,7 +251,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(18, rank); m_object->SetObjectParent(18, 0); - pModFile->ReadModel("objects\\ant4.mod"); + pModFile->ReadModel("data/models/ant4.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(18, Math::Vector(1.0f, -0.1f, 0.7f)); m_object->SetAngleY(18, Math::PI); @@ -261,7 +261,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(19, rank); m_object->SetObjectParent(19, 18); - pModFile->ReadModel("objects\\ant5.mod"); + pModFile->ReadModel("data/models/ant5.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(19, Math::Vector(0.0f, 0.0f, -1.0f)); @@ -270,7 +270,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(20, rank); m_object->SetObjectParent(20, 19); - pModFile->ReadModel("objects\\ant6.mod"); + pModFile->ReadModel("data/models/ant6.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(20, Math::Vector(0.0f, 0.0f, -2.0f)); @@ -279,7 +279,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(21, rank); m_object->SetObjectParent(21, 0); - pModFile->ReadModel("objects\\bee7.mod"); + pModFile->ReadModel("data/models/bee7.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(21, Math::Vector(0.8f, 0.4f, -0.5f)); @@ -288,7 +288,7 @@ bool CMotionBee::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(22, rank); m_object->SetObjectParent(22, 0); - pModFile->ReadModel("objects\\bee7.mod"); + pModFile->ReadModel("data/models/bee7.mod"); pModFile->Mirror(); pModFile->CreateEngineObject(rank); m_object->SetPosition(22, Math::Vector(0.8f, 0.4f, 0.5f)); diff --git a/src/object/motion/motionhuman.cpp b/src/object/motion/motionhuman.cpp index 560a0de..6d849d7 100644 --- a/src/object/motion/motionhuman.cpp +++ b/src/object/motion/motionhuman.cpp @@ -110,7 +110,7 @@ bool CMotionHuman::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_VEHICULE); // this is a moving object m_object->SetObjectRank(0, rank); face = m_main->GetGamerFace(); - sprintf(filename, "objects\\human2h%d.mod", face+1); + sprintf(filename, "data/models/human2h%d.mod", face+1); pModFile->ReadModel(filename); pModFile->CreateEngineObject(rank); @@ -121,7 +121,7 @@ bool CMotionHuman::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(1, rank); m_object->SetObjectParent(1, 0); - sprintf(filename, "objects\\human2g%d.mod", glasses); + sprintf(filename, "data/models/human2g%d.mod", glasses); pModFile->ReadModel(filename); pModFile->CreateEngineObject(rank); } @@ -142,15 +142,15 @@ bool CMotionHuman::Create(Math::Vector pos, float angle, ObjectType type, if ( option == 0 ) // head in helmet? { - pModFile->ReadModel("objects\\human1c.mod"); + pModFile->ReadModel("data/models/human1c.mod"); } if ( option == 1 ) // head without helmet? { - pModFile->ReadModel("objects\\human1h.mod"); + pModFile->ReadModel("data/models/human1h.mod"); } if ( option == 2 ) // without a backpack? { - pModFile->ReadModel("objects\\human1v.mod"); + pModFile->ReadModel("data/models/human1v.mod"); } pModFile->CreateEngineObject(rank); @@ -172,20 +172,20 @@ bool CMotionHuman::Create(Math::Vector pos, float angle, ObjectType type, if ( option == 0 ) // head in helmet? { face = m_main->GetGamerFace(); - sprintf(filename, "objects\\human2c%d.mod", face+1); + sprintf(filename, "data/models/human2c%d.mod", face+1); pModFile->ReadModel(filename); } if ( option == 1 || // head without helmet? option == 2 ) // without a backpack? { face = m_main->GetGamerFace(); - sprintf(filename, "objects\\human2h%d.mod", face+1); + sprintf(filename, "data/models/human2h%d.mod", face+1); pModFile->ReadModel(filename); } } if ( type == OBJECT_TECH ) { - pModFile->ReadModel("objects\\human2t.mod"); + pModFile->ReadModel("data/models/human2t.mod"); } pModFile->CreateEngineObject(rank); m_object->SetPosition(1, Math::Vector(0.0f, 2.7f, 0.0f)); @@ -203,7 +203,7 @@ bool CMotionHuman::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(15, rank); m_object->SetObjectParent(15, 1); - sprintf(filename, "objects\\human2g%d.mod", glasses); + sprintf(filename, "data/models/human2g%d.mod", glasses); pModFile->ReadModel(filename); pModFile->CreateEngineObject(rank); } @@ -213,7 +213,7 @@ bool CMotionHuman::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(2, rank); m_object->SetObjectParent(2, 0); - pModFile->ReadModel("objects\\human3.mod"); + pModFile->ReadModel("data/models/human3.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(2, Math::Vector(0.0f, 2.3f, -1.2f)); m_object->SetAngle(2, Math::Vector(90.0f*Math::PI/180.0f, 90.0f*Math::PI/180.0f, -50.0f*Math::PI/180.0f)); @@ -223,7 +223,7 @@ bool CMotionHuman::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(3, rank); m_object->SetObjectParent(3, 2); - pModFile->ReadModel("objects\\human4r.mod"); + pModFile->ReadModel("data/models/human4r.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(3, Math::Vector(1.3f, 0.0f, 0.0f)); m_object->SetAngle(3, Math::Vector(0.0f*Math::PI/180.0f, -20.0f*Math::PI/180.0f, 0.0f*Math::PI/180.0f)); @@ -233,7 +233,7 @@ bool CMotionHuman::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(4, rank); m_object->SetObjectParent(4, 3); - pModFile->ReadModel("objects\\human5.mod"); + pModFile->ReadModel("data/models/human5.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(4, Math::Vector(1.2f, 0.0f, 0.0f)); @@ -242,7 +242,7 @@ bool CMotionHuman::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(5, rank); m_object->SetObjectParent(5, 0); - pModFile->ReadModel("objects\\human6.mod"); + pModFile->ReadModel("data/models/human6.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(5, Math::Vector(0.0f, 0.0f, -0.7f)); m_object->SetAngle(5, Math::Vector(10.0f*Math::PI/180.0f, 0.0f*Math::PI/180.0f, 5.0f*Math::PI/180.0f)); @@ -252,7 +252,7 @@ bool CMotionHuman::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(6, rank); m_object->SetObjectParent(6, 5); - pModFile->ReadModel("objects\\human7.mod"); + pModFile->ReadModel("data/models/human7.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(6, Math::Vector(0.0f, -1.5f, 0.0f)); m_object->SetAngle(6, Math::Vector(0.0f*Math::PI/180.0f, 0.0f*Math::PI/180.0f, -10.0f*Math::PI/180.0f)); @@ -262,7 +262,7 @@ bool CMotionHuman::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(7, rank); m_object->SetObjectParent(7, 6); - pModFile->ReadModel("objects\\human8.mod"); + pModFile->ReadModel("data/models/human8.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(7, Math::Vector(0.0f, -1.5f, 0.0f)); m_object->SetAngle(7, Math::Vector(-10.0f*Math::PI/180.0f, 5.0f*Math::PI/180.0f, 5.0f*Math::PI/180.0f)); @@ -272,7 +272,7 @@ bool CMotionHuman::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(8, rank); m_object->SetObjectParent(8, 0); - pModFile->ReadModel("objects\\human3.mod"); + pModFile->ReadModel("data/models/human3.mod"); pModFile->Mirror(); pModFile->CreateEngineObject(rank); m_object->SetPosition(8, Math::Vector(0.0f, 2.3f, 1.2f)); @@ -283,7 +283,7 @@ bool CMotionHuman::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(9, rank); m_object->SetObjectParent(9, 8); - pModFile->ReadModel("objects\\human4l.mod"); + pModFile->ReadModel("data/models/human4l.mod"); pModFile->Mirror(); pModFile->CreateEngineObject(rank); m_object->SetPosition(9, Math::Vector(1.3f, 0.0f, 0.0f)); @@ -294,7 +294,7 @@ bool CMotionHuman::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(10, rank); m_object->SetObjectParent(10, 9); - pModFile->ReadModel("objects\\human5.mod"); + pModFile->ReadModel("data/models/human5.mod"); pModFile->Mirror(); pModFile->CreateEngineObject(rank); m_object->SetPosition(10, Math::Vector(1.2f, 0.0f, 0.0f)); @@ -304,7 +304,7 @@ bool CMotionHuman::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(11, rank); m_object->SetObjectParent(11, 0); - pModFile->ReadModel("objects\\human6.mod"); + pModFile->ReadModel("data/models/human6.mod"); pModFile->Mirror(); pModFile->CreateEngineObject(rank); m_object->SetPosition(11, Math::Vector(0.0f, 0.0f, 0.7f)); @@ -315,7 +315,7 @@ bool CMotionHuman::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(12, rank); m_object->SetObjectParent(12, 11); - pModFile->ReadModel("objects\\human7.mod"); + pModFile->ReadModel("data/models/human7.mod"); pModFile->Mirror(); pModFile->CreateEngineObject(rank); m_object->SetPosition(12, Math::Vector(0.0f, -1.5f, 0.0f)); @@ -326,7 +326,7 @@ bool CMotionHuman::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(13, rank); m_object->SetObjectParent(13, 12); - pModFile->ReadModel("objects\\human8.mod"); + pModFile->ReadModel("data/models/human8.mod"); pModFile->Mirror(); pModFile->CreateEngineObject(rank); m_object->SetPosition(13, Math::Vector(0.0f, -1.5f, 0.0f)); @@ -339,7 +339,7 @@ bool CMotionHuman::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(14, rank); m_object->SetObjectParent(14, 0); - pModFile->ReadModel("objects\\human9.mod"); + pModFile->ReadModel("data/models/human9.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(14, Math::Vector(-1.5f, 0.3f, -1.35f)); m_object->SetAngleZ(14, Math::PI); diff --git a/src/object/motion/motionmother.cpp b/src/object/motion/motionmother.cpp index d8850e2..9f02e31 100644 --- a/src/object/motion/motionmother.cpp +++ b/src/object/motion/motionmother.cpp @@ -81,7 +81,7 @@ bool CMotionMother::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_VEHICULE); // this is a moving object m_object->SetObjectRank(0, rank); - pModFile->ReadModel("objects\\mother1.mod"); + pModFile->ReadModel("data/models/mother1.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(0, pos); @@ -97,7 +97,7 @@ bool CMotionMother::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(1, rank); m_object->SetObjectParent(1, 0); - pModFile->ReadModel("objects\\mother2.mod"); + pModFile->ReadModel("data/models/mother2.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(1, Math::Vector(16.0f, 3.0f, 0.0f)); @@ -106,7 +106,7 @@ bool CMotionMother::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(2, rank); m_object->SetObjectParent(2, 0); - pModFile->ReadModel("objects\\mother3.mod"); + pModFile->ReadModel("data/models/mother3.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(2, Math::Vector(-5.0f, -1.0f, -12.0f)); @@ -115,7 +115,7 @@ bool CMotionMother::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(3, rank); m_object->SetObjectParent(3, 2); - pModFile->ReadModel("objects\\mother4.mod"); + pModFile->ReadModel("data/models/mother4.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(3, Math::Vector(0.0f, 0.0f, -8.5f)); @@ -124,7 +124,7 @@ bool CMotionMother::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(4, rank); m_object->SetObjectParent(4, 0); - pModFile->ReadModel("objects\\mother3.mod"); + pModFile->ReadModel("data/models/mother3.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(4, Math::Vector(3.5f, -1.0f, -12.0f)); @@ -133,7 +133,7 @@ bool CMotionMother::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(5, rank); m_object->SetObjectParent(5, 4); - pModFile->ReadModel("objects\\mother4.mod"); + pModFile->ReadModel("data/models/mother4.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(5, Math::Vector(0.0f, 0.0f, -8.5f)); @@ -142,7 +142,7 @@ bool CMotionMother::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(6, rank); m_object->SetObjectParent(6, 0); - pModFile->ReadModel("objects\\mother3.mod"); + pModFile->ReadModel("data/models/mother3.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(6, Math::Vector(10.0f, -1.0f, -10.0f)); @@ -151,7 +151,7 @@ bool CMotionMother::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(7, rank); m_object->SetObjectParent(7, 6); - pModFile->ReadModel("objects\\mother4.mod"); + pModFile->ReadModel("data/models/mother4.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(7, Math::Vector(0.0f, 0.0f, -8.5f)); @@ -160,7 +160,7 @@ bool CMotionMother::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(8, rank); m_object->SetObjectParent(8, 0); - pModFile->ReadModel("objects\\mother3.mod"); + pModFile->ReadModel("data/models/mother3.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(8, Math::Vector(-5.0f, -1.0f, 12.0f)); m_object->SetAngleY(8, Math::PI); @@ -170,7 +170,7 @@ bool CMotionMother::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(9, rank); m_object->SetObjectParent(9, 8); - pModFile->ReadModel("objects\\mother4.mod"); + pModFile->ReadModel("data/models/mother4.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(9, Math::Vector(0.0f, 0.0f, -8.5f)); @@ -179,7 +179,7 @@ bool CMotionMother::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(10, rank); m_object->SetObjectParent(10, 0); - pModFile->ReadModel("objects\\mother3.mod"); + pModFile->ReadModel("data/models/mother3.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(10, Math::Vector(3.5f, -1.0f, 12.0f)); m_object->SetAngleY(10, Math::PI); @@ -189,7 +189,7 @@ bool CMotionMother::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(11, rank); m_object->SetObjectParent(11, 10); - pModFile->ReadModel("objects\\mother4.mod"); + pModFile->ReadModel("data/models/mother4.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(11, Math::Vector(0.0f, 0.0f, -8.5f)); @@ -198,7 +198,7 @@ bool CMotionMother::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(12, rank); m_object->SetObjectParent(12, 0); - pModFile->ReadModel("objects\\mother3.mod"); + pModFile->ReadModel("data/models/mother3.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(12, Math::Vector(10.0f, -1.0f, 10.0f)); m_object->SetAngleY(12, Math::PI); @@ -208,7 +208,7 @@ bool CMotionMother::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(13, rank); m_object->SetObjectParent(13, 12); - pModFile->ReadModel("objects\\mother4.mod"); + pModFile->ReadModel("data/models/mother4.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(13, Math::Vector(0.0f, 0.0f, -8.5f)); @@ -217,7 +217,7 @@ bool CMotionMother::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(14, rank); m_object->SetObjectParent(14, 1); - pModFile->ReadModel("objects\\mother5.mod"); + pModFile->ReadModel("data/models/mother5.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(14, Math::Vector(6.0f, 1.0f, -2.5f)); @@ -225,7 +225,7 @@ bool CMotionMother::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(15, rank); m_object->SetObjectParent(15, 14); - pModFile->ReadModel("objects\\mother6.mod"); + pModFile->ReadModel("data/models/mother6.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(15, Math::Vector(8.0f, 0.0f, 0.0f)); @@ -234,7 +234,7 @@ bool CMotionMother::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(16, rank); m_object->SetObjectParent(16, 1); - pModFile->ReadModel("objects\\mother5.mod"); + pModFile->ReadModel("data/models/mother5.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(16, Math::Vector(6.0f, 1.0f, 2.5f)); @@ -242,7 +242,7 @@ bool CMotionMother::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(17, rank); m_object->SetObjectParent(17, 16); - pModFile->ReadModel("objects\\mother6.mod"); + pModFile->ReadModel("data/models/mother6.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(17, Math::Vector(8.0f, 0.0f, 0.0f)); @@ -251,7 +251,7 @@ bool CMotionMother::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(18, rank); m_object->SetObjectParent(18, 1); - pModFile->ReadModel("objects\\mother7.mod"); + pModFile->ReadModel("data/models/mother7.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(18, Math::Vector(-4.0f, -3.5f, -8.0f)); m_object->SetZoomX(18, 1.2f); @@ -261,7 +261,7 @@ bool CMotionMother::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(19, rank); m_object->SetObjectParent(19, 1); - pModFile->ReadModel("objects\\mother7.mod"); + pModFile->ReadModel("data/models/mother7.mod"); pModFile->Mirror(); pModFile->CreateEngineObject(rank); m_object->SetPosition(19, Math::Vector(-4.0f, -3.5f, 8.0f)); diff --git a/src/object/motion/motionspider.cpp b/src/object/motion/motionspider.cpp index a3b55fc..0c0996a 100644 --- a/src/object/motion/motionspider.cpp +++ b/src/object/motion/motionspider.cpp @@ -106,7 +106,7 @@ bool CMotionSpider::Create(Math::Vector pos, float angle, ObjectType type, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_VEHICULE); // this is a moving object m_object->SetObjectRank(0, rank); - pModFile->ReadModel("objects\\spider0.mod"); // doesn't exist + pModFile->ReadModel("data/models/spider0.mod"); // doesn't exist pModFile->CreateEngineObject(rank); m_object->SetPosition(0, pos); m_object->SetAngleY(0, angle); @@ -121,7 +121,7 @@ bool CMotionSpider::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(1, rank); m_object->SetObjectParent(1, 0); - pModFile->ReadModel("objects\\spider1.mod"); + pModFile->ReadModel("data/models/spider1.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(1, Math::Vector(1.0f, 0.0f, 0.0f)); @@ -130,7 +130,7 @@ bool CMotionSpider::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(2, rank); m_object->SetObjectParent(2, 0); - pModFile->ReadModel("objects\\spider2.mod"); + pModFile->ReadModel("data/models/spider2.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(2, Math::Vector(1.0f, 0.0f, 0.0f)); @@ -139,7 +139,7 @@ bool CMotionSpider::Create(Math::Vector pos, float angle, ObjectType type, { for ( j=0 ; j<4 ; j++ ) { - sprintf(name, "objects\\spider%d.mod", j+3); // 3..6 + sprintf(name, "data/models/spider%d.mod", j+3); // 3..6 // Creates the right leg. rank = m_engine->CreateObject(); @@ -177,7 +177,7 @@ bool CMotionSpider::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(35, rank); m_object->SetObjectParent(35, 1); - pModFile->ReadModel("objects\\spider7.mod"); + pModFile->ReadModel("data/models/spider7.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(35, Math::Vector(0.0f, 0.0f, -0.3f)); @@ -186,7 +186,7 @@ bool CMotionSpider::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(36, rank); m_object->SetObjectParent(36, 1); - pModFile->ReadModel("objects\\spider7.mod"); + pModFile->ReadModel("data/models/spider7.mod"); pModFile->Mirror(); pModFile->CreateEngineObject(rank); m_object->SetPosition(36, Math::Vector(0.0f, 0.0f, 0.3f)); diff --git a/src/object/motion/motiontoto.cpp b/src/object/motion/motiontoto.cpp index af2cf6b..7068564 100644 --- a/src/object/motion/motiontoto.cpp +++ b/src/object/motion/motiontoto.cpp @@ -91,7 +91,7 @@ bool CMotionToto::Create(Math::Vector pos, float angle, ObjectType type, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_VEHICULE); // this is a moving object m_object->SetObjectRank(0, rank); - pModFile->ReadModel("objects\\toto1.mod"); + pModFile->ReadModel("data/models/toto1.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(0, pos); m_object->SetAngleY(0, angle); @@ -101,7 +101,7 @@ bool CMotionToto::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(1, rank); m_object->SetObjectParent(1, 0); - pModFile->ReadModel("objects\\toto2.mod"); + pModFile->ReadModel("data/models/toto2.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(1, Math::Vector(1.00f, 0.17f, 0.00f)); @@ -110,7 +110,7 @@ bool CMotionToto::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(2, rank); m_object->SetObjectParent(2, 0); - pModFile->ReadModel("objects\\toto3.mod"); + pModFile->ReadModel("data/models/toto3.mod"); pModFile->Mirror(); pModFile->CreateEngineObject(rank); m_object->SetPosition(2, Math::Vector(0.85f, 1.04f, 0.25f)); @@ -121,7 +121,7 @@ bool CMotionToto::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(3, rank); m_object->SetObjectParent(3, 0); - pModFile->ReadModel("objects\\toto3.mod"); + pModFile->ReadModel("data/models/toto3.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(3, Math::Vector(0.85f, 1.04f, -0.25f)); m_object->SetAngleY(3, 20.0f*Math::PI/180.0f); @@ -131,7 +131,7 @@ bool CMotionToto::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(4, rank); m_object->SetObjectParent(4, 0); - pModFile->ReadModel("objects\\toto4.mod"); + pModFile->ReadModel("data/models/toto4.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(4, Math::Vector(0.0f, 1.9f, 0.3f)); m_object->SetAngleX(4, 30.0f*Math::PI/180.0f); @@ -140,7 +140,7 @@ bool CMotionToto::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(5, rank); m_object->SetObjectParent(5, 4); - pModFile->ReadModel("objects\\toto4.mod"); + pModFile->ReadModel("data/models/toto4.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(5, Math::Vector(0.0f, 0.67f, 0.0f)); m_object->SetAngleX(5, 30.0f*Math::PI/180.0f); @@ -149,7 +149,7 @@ bool CMotionToto::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(6, rank); m_object->SetObjectParent(6, 5); - pModFile->ReadModel("objects\\toto5.mod"); + pModFile->ReadModel("data/models/toto5.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(6, Math::Vector(0.0f, 0.70f, 0.0f)); m_object->SetAngleX(6, 30.0f*Math::PI/180.0f); @@ -159,7 +159,7 @@ bool CMotionToto::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(7, rank); m_object->SetObjectParent(7, 0); - pModFile->ReadModel("objects\\toto4.mod"); + pModFile->ReadModel("data/models/toto4.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(7, Math::Vector(0.0f, 1.9f, -0.3f)); m_object->SetAngleX(7, -30.0f*Math::PI/180.0f); @@ -168,7 +168,7 @@ bool CMotionToto::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(8, rank); m_object->SetObjectParent(8, 7); - pModFile->ReadModel("objects\\toto4.mod"); + pModFile->ReadModel("data/models/toto4.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(8, Math::Vector(0.0f, 0.67f, 0.0f)); m_object->SetAngleX(8, -30.0f*Math::PI/180.0f); @@ -177,7 +177,7 @@ bool CMotionToto::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(9, rank); m_object->SetObjectParent(9, 8); - pModFile->ReadModel("objects\\toto5.mod"); + pModFile->ReadModel("data/models/toto5.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(9, Math::Vector(0.0f, 0.70f, 0.0f)); m_object->SetAngleX(9, -30.0f*Math::PI/180.0f); diff --git a/src/object/motion/motionvehicle.cpp b/src/object/motion/motionvehicle.cpp index 1a4b98f..ff74f71 100644 --- a/src/object/motion/motionvehicle.cpp +++ b/src/object/motion/motionvehicle.cpp @@ -111,14 +111,14 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, type == OBJECT_MOBILEfi || type == OBJECT_MOBILEfs ) { - pModFile->ReadModel("objects\\lem1f.mod"); + pModFile->ReadModel("data/models/lem1f.mod"); } if ( type == OBJECT_MOBILEta || type == OBJECT_MOBILEtc || type == OBJECT_MOBILEti || type == OBJECT_MOBILEts ) { - pModFile->ReadModel("objects\\lem1t.mod"); + pModFile->ReadModel("data/models/lem1t.mod"); } if ( type == OBJECT_MOBILEwa || type == OBJECT_MOBILEwc || @@ -127,11 +127,11 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, { if ( m_object->GetTrainer() ) { - pModFile->ReadModel("objects\\lem1wt.mod"); + pModFile->ReadModel("data/models/lem1wt.mod"); } else { - pModFile->ReadModel("objects\\lem1w.mod"); + pModFile->ReadModel("data/models/lem1w.mod"); } } if ( type == OBJECT_MOBILEia || @@ -139,46 +139,46 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, type == OBJECT_MOBILEii || type == OBJECT_MOBILEis ) { - pModFile->ReadModel("objects\\lem1i.mod"); + pModFile->ReadModel("data/models/lem1i.mod"); } if ( type == OBJECT_MOBILErt || type == OBJECT_MOBILErc || type == OBJECT_MOBILErr || type == OBJECT_MOBILErs ) { - pModFile->ReadModel("objects\\roller1.mod"); + pModFile->ReadModel("data/models/roller1.mod"); } if ( type == OBJECT_MOBILEsa ) { - pModFile->ReadModel("objects\\subm1.mod"); + pModFile->ReadModel("data/models/subm1.mod"); } if ( type == OBJECT_MOBILEtg ) { - pModFile->ReadModel("objects\\target.mod"); + pModFile->ReadModel("data/models/target.mod"); } if ( type == OBJECT_MOBILEwt ) { - pModFile->ReadModel("objects\\trainerw.mod"); + pModFile->ReadModel("data/models/trainerw.mod"); } if ( type == OBJECT_MOBILEft ) { - pModFile->ReadModel("objects\\trainerf.mod"); + pModFile->ReadModel("data/models/trainerf.mod"); } if ( type == OBJECT_MOBILEtt ) { - pModFile->ReadModel("objects\\trainert.mod"); + pModFile->ReadModel("data/models/trainert.mod"); } if ( type == OBJECT_MOBILEit ) { - pModFile->ReadModel("objects\\traineri.mod"); + pModFile->ReadModel("data/models/traineri.mod"); } if ( type == OBJECT_MOBILEdr ) { - pModFile->ReadModel("objects\\drawer1.mod"); + pModFile->ReadModel("data/models/drawer1.mod"); } if ( type == OBJECT_APOLLO2 ) { - pModFile->ReadModel("objects\\apolloj1.mod"); + pModFile->ReadModel("data/models/apolloj1.mod"); } pModFile->CreateEngineObject(rank); @@ -225,7 +225,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(1, rank); m_object->SetObjectParent(1, 0); - pModFile->ReadModel("objects\\lem2.mod"); + pModFile->ReadModel("data/models/lem2.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(1, Math::Vector(0.0f, 5.3f, 0.0f)); m_object->SetAngleZ(1, ARM_NEUTRAL_ANGLE1); @@ -235,7 +235,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(2, rank); m_object->SetObjectParent(2, 1); - pModFile->ReadModel("objects\\lem3.mod"); + pModFile->ReadModel("data/models/lem3.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(2, Math::Vector(5.0f, 0.0f, 0.0f)); m_object->SetAngleZ(2, ARM_NEUTRAL_ANGLE2); @@ -245,7 +245,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(3, rank); m_object->SetObjectParent(3, 2); - pModFile->ReadModel("objects\\lem4.mod"); + pModFile->ReadModel("data/models/lem4.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(3, Math::Vector(3.5f, 0.0f, 0.0f)); m_object->SetAngleZ(3, ARM_NEUTRAL_ANGLE3); @@ -256,7 +256,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(4, rank); m_object->SetObjectParent(4, 3); - pModFile->ReadModel("objects\\lem5.mod"); + pModFile->ReadModel("data/models/lem5.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(4, Math::Vector(1.5f, 0.0f, 0.0f)); m_object->SetAngleZ(4, -Math::PI*0.10f); @@ -266,7 +266,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(5, rank); m_object->SetObjectParent(5, 3); - pModFile->ReadModel("objects\\lem6.mod"); + pModFile->ReadModel("data/models/lem6.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(5, Math::Vector(1.5f, 0.0f, 0.0f)); m_object->SetAngleZ(5, Math::PI*0.10f); @@ -282,7 +282,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(1, rank); m_object->SetObjectParent(1, 0); - pModFile->ReadModel("objects\\lem2.mod"); + pModFile->ReadModel("data/models/lem2.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(1, Math::Vector(0.0f, 5.3f, 0.0f)); m_object->SetAngleZ(1, 110.0f*Math::PI/180.0f); @@ -292,7 +292,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(2, rank); m_object->SetObjectParent(2, 1); - pModFile->ReadModel("objects\\lem3.mod"); + pModFile->ReadModel("data/models/lem3.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(2, Math::Vector(5.0f, 0.0f, 0.0f)); m_object->SetAngleZ(2, -110.0f*Math::PI/180.0f); @@ -302,7 +302,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(3, rank); m_object->SetObjectParent(3, 2); - pModFile->ReadModel("objects\\lem4s.mod"); + pModFile->ReadModel("data/models/lem4s.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(3, Math::Vector(3.5f, 0.0f, 0.0f)); m_object->SetAngleZ(3, -65.0f*Math::PI/180.0f); @@ -318,7 +318,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(1, rank); m_object->SetObjectParent(1, 0); - pModFile->ReadModel("objects\\canon.mod"); + pModFile->ReadModel("data/models/canon.mod"); pModFile->CreateEngineObject(rank); //? m_object->SetPosition(1, Math::Vector(0.0f, 5.3f, 0.0f)); m_object->SetPosition(1, Math::Vector(0.0f, 5.3f, 0.0f)); @@ -335,7 +335,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(1, rank); m_object->SetObjectParent(1, 0); - pModFile->ReadModel("objects\\canoni1.mod"); + pModFile->ReadModel("data/models/canoni1.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(1, Math::Vector(0.0f, 5.3f, 0.0f)); m_object->SetAngleZ(1, 0.0f); @@ -344,7 +344,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(2, rank); m_object->SetObjectParent(2, 1); - pModFile->ReadModel("objects\\canoni2.mod"); + pModFile->ReadModel("data/models/canoni2.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(2, Math::Vector(0.0f, 2.5f, 0.0f)); m_object->SetAngleZ(2, 0.0f); @@ -361,7 +361,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(6, rank); m_object->SetObjectParent(6, 0); - pModFile->ReadModel("objects\\lem2w.mod"); + pModFile->ReadModel("data/models/lem2w.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(6, Math::Vector(-3.0f, 1.0f, -3.0f)); @@ -370,7 +370,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(7, rank); m_object->SetObjectParent(7, 0); - pModFile->ReadModel("objects\\lem2w.mod"); + pModFile->ReadModel("data/models/lem2w.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(7, Math::Vector(-3.0f, 1.0f, 3.0f)); m_object->SetAngleY(7, Math::PI); @@ -380,7 +380,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(8, rank); m_object->SetObjectParent(8, 0); - pModFile->ReadModel("objects\\lem2w.mod"); + pModFile->ReadModel("data/models/lem2w.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(8, Math::Vector(2.0f, 1.0f, -3.0f)); @@ -389,7 +389,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(9, rank); m_object->SetObjectParent(9, 0); - pModFile->ReadModel("objects\\lem2w.mod"); + pModFile->ReadModel("data/models/lem2w.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(9, Math::Vector(2.0f, 1.0f, 3.0f)); m_object->SetAngleY(9, Math::PI); @@ -402,7 +402,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(6, rank); m_object->SetObjectParent(6, 0); - pModFile->ReadModel("objects\\lem2w.mod"); + pModFile->ReadModel("data/models/lem2w.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(6, Math::Vector(-2.0f, 1.0f, -3.0f)); @@ -411,7 +411,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(7, rank); m_object->SetObjectParent(7, 0); - pModFile->ReadModel("objects\\lem2w.mod"); + pModFile->ReadModel("data/models/lem2w.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(7, Math::Vector(-2.0f, 1.0f, 3.0f)); m_object->SetAngleY(7, Math::PI); @@ -421,7 +421,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(8, rank); m_object->SetObjectParent(8, 0); - pModFile->ReadModel("objects\\lem2w.mod"); + pModFile->ReadModel("data/models/lem2w.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(8, Math::Vector(3.0f, 1.0f, -3.0f)); @@ -430,7 +430,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(9, rank); m_object->SetObjectParent(9, 0); - pModFile->ReadModel("objects\\lem2w.mod"); + pModFile->ReadModel("data/models/lem2w.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(9, Math::Vector(3.0f, 1.0f, 3.0f)); m_object->SetAngleY(9, Math::PI); @@ -446,7 +446,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(6, rank); m_object->SetObjectParent(6, 0); - pModFile->ReadModel("objects\\lem2t.mod"); + pModFile->ReadModel("data/models/lem2t.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(6, Math::Vector(0.0f, 2.0f, -3.0f)); @@ -455,7 +455,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(7, rank); m_object->SetObjectParent(7, 0); - pModFile->ReadModel("objects\\lem3t.mod"); + pModFile->ReadModel("data/models/lem3t.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(7, Math::Vector(0.0f, 2.0f, 3.0f)); } @@ -470,7 +470,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(6, rank); m_object->SetObjectParent(6, 0); - pModFile->ReadModel("objects\\roller2.mod"); + pModFile->ReadModel("data/models/roller2.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(6, Math::Vector(0.0f, 2.0f, -3.0f)); @@ -479,7 +479,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(7, rank); m_object->SetObjectParent(7, 0); - pModFile->ReadModel("objects\\roller3.mod"); + pModFile->ReadModel("data/models/roller3.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(7, Math::Vector(0.0f, 2.0f, 3.0f)); } @@ -491,7 +491,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(6, rank); m_object->SetObjectParent(6, 0); - pModFile->ReadModel("objects\\subm4.mod"); + pModFile->ReadModel("data/models/subm4.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(6, Math::Vector(0.0f, 1.0f, -3.0f)); @@ -500,7 +500,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(7, rank); m_object->SetObjectParent(7, 0); - pModFile->ReadModel("objects\\subm5.mod"); + pModFile->ReadModel("data/models/subm5.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(7, Math::Vector(0.0f, 1.0f, 3.0f)); } @@ -512,7 +512,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(6, rank); m_object->SetObjectParent(6, 0); - pModFile->ReadModel("objects\\drawer2.mod"); + pModFile->ReadModel("data/models/drawer2.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(6, Math::Vector(0.0f, 1.0f, -3.0f)); @@ -521,7 +521,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(7, rank); m_object->SetObjectParent(7, 0); - pModFile->ReadModel("objects\\drawer3.mod"); + pModFile->ReadModel("data/models/drawer3.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(7, Math::Vector(0.0f, 1.0f, 3.0f)); } @@ -537,7 +537,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(6, rank); m_object->SetObjectParent(6, 0); - pModFile->ReadModel("objects\\lem2f.mod"); + pModFile->ReadModel("data/models/lem2f.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(6, Math::Vector(1.7f, 3.0f, 0.0f)); @@ -546,7 +546,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(7, rank); m_object->SetObjectParent(7, 0); - pModFile->ReadModel("objects\\lem2f.mod"); + pModFile->ReadModel("data/models/lem2f.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(7, Math::Vector(-1.8f, 3.0f, -1.5f)); m_object->SetAngleY(7, 120.0f*Math::PI/180.0f); @@ -556,7 +556,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(8, rank); m_object->SetObjectParent(8, 0); - pModFile->ReadModel("objects\\lem2f.mod"); + pModFile->ReadModel("data/models/lem2f.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(8, Math::Vector(-1.8f, 3.0f, 1.5f)); m_object->SetAngleY(8, -120.0f*Math::PI/180.0f); @@ -587,7 +587,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, { for ( j=0 ; j<3 ; j++ ) { - sprintf(name, "objects\\ant%d.mod", j+4); // 4..6 + sprintf(name, "data/models/ant%d.mod", j+4); // 4..6 // Creates the right leg. rank = m_engine->CreateObject(); @@ -628,7 +628,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(1, rank); m_object->SetObjectParent(1, 0); - pModFile->ReadModel("objects\\roller2t.mod"); + pModFile->ReadModel("data/models/roller2t.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(1, Math::Vector(0.0f, 0.0f, 0.0f)); m_object->SetAngleZ(1, 0.0f); @@ -638,7 +638,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(2, rank); m_object->SetObjectParent(2, 0); - pModFile->ReadModel("objects\\roller3t.mod"); + pModFile->ReadModel("data/models/roller3t.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(2, Math::Vector(9.0f, 4.0f, 0.0f)); m_object->SetAngleZ(2, 0.0f); @@ -651,7 +651,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(1, rank); m_object->SetObjectParent(1, 0); - pModFile->ReadModel("objects\\roller2c.mod"); + pModFile->ReadModel("data/models/roller2c.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(1, Math::Vector(3.0f, 4.6f, 0.0f)); m_object->SetAngleZ(1, Math::PI/8.0f); @@ -661,7 +661,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(2, rank); m_object->SetObjectParent(2, 0); - pModFile->ReadModel("objects\\roller3p.mod"); + pModFile->ReadModel("data/models/roller3p.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(2, Math::Vector(7.0f, 6.5f, 0.0f)); m_object->SetAngleZ(2, 0.0f); @@ -674,7 +674,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(1, rank); m_object->SetObjectParent(1, 0); - pModFile->ReadModel("objects\\recover1.mod"); + pModFile->ReadModel("data/models/recover1.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(1, Math::Vector(2.0f, 5.0f, 0.0f)); @@ -683,7 +683,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(2, rank); m_object->SetObjectParent(2, 1); - pModFile->ReadModel("objects\\recover2.mod"); + pModFile->ReadModel("data/models/recover2.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(2, Math::Vector(0.1f, 0.0f, -5.0f)); m_object->SetAngleZ(2, 126.0f*Math::PI/180.0f); @@ -693,7 +693,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(3, rank); m_object->SetObjectParent(3, 2); - pModFile->ReadModel("objects\\recover3.mod"); + pModFile->ReadModel("data/models/recover3.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(3, Math::Vector(5.0f, 0.0f, -0.5f)); m_object->SetAngleZ(3, -144.0f*Math::PI/180.0f); @@ -703,7 +703,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(4, rank); m_object->SetObjectParent(4, 1); - pModFile->ReadModel("objects\\recover2.mod"); + pModFile->ReadModel("data/models/recover2.mod"); pModFile->Mirror(); pModFile->CreateEngineObject(rank); m_object->SetPosition(4, Math::Vector(0.1f, 0.0f, 5.0f)); @@ -714,7 +714,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(5, rank); m_object->SetObjectParent(5, 4); - pModFile->ReadModel("objects\\recover3.mod"); + pModFile->ReadModel("data/models/recover3.mod"); pModFile->Mirror(); pModFile->CreateEngineObject(rank); m_object->SetPosition(5, Math::Vector(5.0f, 0.0f, 0.5f)); @@ -728,7 +728,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(1, rank); m_object->SetObjectParent(1, 0); - pModFile->ReadModel("objects\\roller2s.mod"); + pModFile->ReadModel("data/models/roller2s.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(1, Math::Vector(0.0f, 0.0f, 0.0f)); m_object->SetAngleZ(1, 0.0f); @@ -738,7 +738,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(2, rank); m_object->SetObjectParent(2, 1); - pModFile->ReadModel("objects\\roller3s.mod"); + pModFile->ReadModel("data/models/roller3s.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(2, Math::Vector(7.0f, 4.5f, 0.0f)); m_object->SetAngleZ(2, 0.0f); @@ -748,7 +748,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(3, rank); m_object->SetObjectParent(3, 2); - pModFile->ReadModel("objects\\roller4s.mod"); + pModFile->ReadModel("data/models/roller4s.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(3, Math::Vector(0.0f, 1.0f, 0.0f)); m_object->SetAngleZ(3, 0.0f); @@ -761,7 +761,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(1, rank); m_object->SetObjectParent(1, 0); - pModFile->ReadModel("objects\\subm2.mod"); + pModFile->ReadModel("data/models/subm2.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(1, Math::Vector(4.2f, 3.0f, 0.0f)); @@ -770,7 +770,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(2, rank); m_object->SetObjectParent(2, 1); - pModFile->ReadModel("objects\\subm3.mod"); + pModFile->ReadModel("data/models/subm3.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(2, Math::Vector(0.5f, 0.0f, -1.5f)); @@ -779,7 +779,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(3, rank); m_object->SetObjectParent(3, 1); - pModFile->ReadModel("objects\\subm3.mod"); + pModFile->ReadModel("data/models/subm3.mod"); pModFile->Mirror(); pModFile->CreateEngineObject(rank); m_object->SetPosition(3, Math::Vector(0.5f, 0.0f, 1.5f)); @@ -792,7 +792,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(1, rank); m_object->SetObjectParent(1, 0); - pModFile->ReadModel("objects\\drawer4.mod"); + pModFile->ReadModel("data/models/drawer4.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(1, Math::Vector(-3.0f, 3.0f, 0.0f)); @@ -803,7 +803,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(2, rank); m_object->SetObjectParent(2, 0); - pModFile->ReadModel("objects\\drawer5.mod"); + pModFile->ReadModel("data/models/drawer5.mod"); pModFile->CreateEngineObject(rank); m_posKey = Math::Vector(3.0f, 5.7f, 0.0f); m_object->SetPosition(2, m_posKey); @@ -817,7 +817,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(10+i, rank); m_object->SetObjectParent(10+i, 1); - sprintf(name, "objects\\drawer%d.mod", 10+i); + sprintf(name, "data/models/drawer%d.mod", 10+i); pModFile->ReadModel(name); pModFile->CreateEngineObject(rank); m_object->SetPosition(10+i, Math::Vector(0.0f, 0.0f, 0.0f)); @@ -834,7 +834,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(2, rank); m_object->SetObjectParent(2, 0); - pModFile->ReadModel("objects\\drawer5.mod"); + pModFile->ReadModel("data/models/drawer5.mod"); pModFile->CreateEngineObject(rank); m_posKey = Math::Vector(0.2f, 4.1f, 0.0f); m_object->SetPosition(2, m_posKey); @@ -849,7 +849,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(1, rank); m_object->SetObjectParent(1, 0); - pModFile->ReadModel("objects\\apolloj2.mod"); // antenna + pModFile->ReadModel("data/models/apolloj2.mod"); // antenna pModFile->CreateEngineObject(rank); m_object->SetPosition(1, Math::Vector(5.5f, 8.8f, 2.0f)); m_object->SetAngleY(1, -120.0f*Math::PI/180.0f); @@ -859,7 +859,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(2, rank); m_object->SetObjectParent(2, 0); - pModFile->ReadModel("objects\\apolloj3.mod"); // camera + pModFile->ReadModel("data/models/apolloj3.mod"); // camera pModFile->CreateEngineObject(rank); m_object->SetPosition(2, Math::Vector(5.5f, 2.8f, -2.0f)); m_object->SetAngleY(2, 30.0f*Math::PI/180.0f); @@ -869,7 +869,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(6, rank); m_object->SetObjectParent(6, 0); - pModFile->ReadModel("objects\\apolloj4.mod"); // wheel + pModFile->ReadModel("data/models/apolloj4.mod"); // wheel pModFile->CreateEngineObject(rank); m_object->SetPosition(6, Math::Vector(-5.75f, 1.65f, -5.0f)); @@ -877,7 +877,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(7, rank); m_object->SetObjectParent(7, 0); - pModFile->ReadModel("objects\\apolloj4.mod"); // wheel + pModFile->ReadModel("data/models/apolloj4.mod"); // wheel pModFile->CreateEngineObject(rank); m_object->SetPosition(7, Math::Vector(-5.75f, 1.65f, 5.0f)); @@ -885,7 +885,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(8, rank); m_object->SetObjectParent(8, 0); - pModFile->ReadModel("objects\\apolloj4.mod"); // wheel + pModFile->ReadModel("data/models/apolloj4.mod"); // wheel pModFile->CreateEngineObject(rank); m_object->SetPosition(8, Math::Vector(5.75f, 1.65f, -5.0f)); @@ -893,7 +893,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(9, rank); m_object->SetObjectParent(9, 0); - pModFile->ReadModel("objects\\apolloj4.mod"); // wheel + pModFile->ReadModel("data/models/apolloj4.mod"); // wheel pModFile->CreateEngineObject(rank); m_object->SetPosition(9, Math::Vector(5.75f, 1.65f, 5.00f)); @@ -902,7 +902,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(10, rank); m_object->SetObjectParent(10, 0); - pModFile->ReadModel("objects\\apolloj6.mod"); // wheel + pModFile->ReadModel("data/models/apolloj6.mod"); // wheel pModFile->CreateEngineObject(rank); m_object->SetPosition(10, Math::Vector(-5.75f, 1.65f, -5.0f)); @@ -910,7 +910,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(11, rank); m_object->SetObjectParent(11, 0); - pModFile->ReadModel("objects\\apolloj6.mod"); // wheel + pModFile->ReadModel("data/models/apolloj6.mod"); // wheel pModFile->CreateEngineObject(rank); m_object->SetPosition(11, Math::Vector(-5.75f, 1.65f, 5.0f)); @@ -918,7 +918,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(12, rank); m_object->SetObjectParent(12, 0); - pModFile->ReadModel("objects\\apolloj5.mod"); // wheel + pModFile->ReadModel("data/models/apolloj5.mod"); // wheel pModFile->CreateEngineObject(rank); m_object->SetPosition(12, Math::Vector(5.75f, 1.65f, -5.0f)); @@ -926,7 +926,7 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(13, rank); m_object->SetObjectParent(13, 0); - pModFile->ReadModel("objects\\apolloj5.mod"); // wheel + pModFile->ReadModel("data/models/apolloj5.mod"); // wheel pModFile->CreateEngineObject(rank); m_object->SetPosition(13, Math::Vector(5.75f, 1.65f, 5.00f)); } @@ -1038,8 +1038,8 @@ bool CMotionVehicle::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); pPower->SetObjectRank(0, rank); - if ( power <= 1.0f ) pModFile->ReadModel("objects\\power.mod"); - else pModFile->ReadModel("objects\\atomic.mod"); + if ( power <= 1.0f ) pModFile->ReadModel("data/models/power.mod"); + else pModFile->ReadModel("data/models/atomic.mod"); pModFile->CreateEngineObject(rank); pPower->SetPosition(0, m_object->GetCharacter()->posPower); diff --git a/src/object/motion/motionworm.cpp b/src/object/motion/motionworm.cpp index ce9ded2..dc8ecf0 100644 --- a/src/object/motion/motionworm.cpp +++ b/src/object/motion/motionworm.cpp @@ -92,7 +92,7 @@ bool CMotionWorm::Create(Math::Vector pos, float angle, ObjectType type, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_VEHICULE); // this is a moving object m_object->SetObjectRank(0, rank); - pModFile->ReadModel("objects\\worm0.mod"); // there is no purpose! + pModFile->ReadModel("data/models/worm0.mod"); // there is no purpose! pModFile->CreateEngineObject(rank); m_object->SetPosition(0, pos); m_object->SetAngleY(0, angle); @@ -108,7 +108,7 @@ bool CMotionWorm::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(1, rank); m_object->SetObjectParent(1, 0); - pModFile->ReadModel("objects\\worm1.mod"); + pModFile->ReadModel("data/models/worm1.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(1, Math::Vector(px, 0.0f, 0.0f)); px -= 1.0f; @@ -120,7 +120,7 @@ bool CMotionWorm::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(2+i, rank); m_object->SetObjectParent(2+i, 0); - pModFile->ReadModel("objects\\worm2.mod"); + pModFile->ReadModel("data/models/worm2.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(2+i, Math::Vector(px, 0.0f, 0.0f)); px -= 1.0f; @@ -131,7 +131,7 @@ bool CMotionWorm::Create(Math::Vector pos, float angle, ObjectType type, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_object->SetObjectRank(2+WORM_PART, rank); m_object->SetObjectParent(2+WORM_PART, 0); - pModFile->ReadModel("objects\\worm3.mod"); + pModFile->ReadModel("data/models/worm3.mod"); pModFile->CreateEngineObject(rank); m_object->SetPosition(2+WORM_PART, Math::Vector(px, 0.0f, 0.0f)); diff --git a/src/object/object.cpp b/src/object/object.cpp index dd46e0e..1a4c527 100644 --- a/src/object/object.cpp +++ b/src/object/object.cpp @@ -2372,7 +2372,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, if ( m_type == OBJECT_PORTICO ) { - pModFile->ReadModel("objects\\portico1.mod"); + pModFile->ReadModel("data/models/portico1.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -2382,7 +2382,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(1, rank); SetObjectParent(1, 0); - pModFile->ReadModel("objects\\portico2.mod"); + pModFile->ReadModel("data/models/portico2.mod"); pModFile->CreateEngineObject(rank); SetPosition(1, Math::Vector(0.0f, 67.0f, 0.0f)); @@ -2390,7 +2390,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(2, rank); SetObjectParent(2, 1); - pModFile->ReadModel("objects\\portico3.mod"); + pModFile->ReadModel("data/models/portico3.mod"); pModFile->CreateEngineObject(rank); SetPosition(2, Math::Vector(0.0f, 0.0f, -33.0f)); SetAngleY(2, 45.0f*Math::PI/180.0f); @@ -2399,7 +2399,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(3, rank); SetObjectParent(3, 2); - pModFile->ReadModel("objects\\portico4.mod"); + pModFile->ReadModel("data/models/portico4.mod"); pModFile->CreateEngineObject(rank); SetPosition(3, Math::Vector(50.0f, 0.0f, 0.0f)); SetAngleY(3, -60.0f*Math::PI/180.0f); @@ -2408,7 +2408,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(4, rank); SetObjectParent(4, 3); - pModFile->ReadModel("objects\\portico5.mod"); + pModFile->ReadModel("data/models/portico5.mod"); pModFile->CreateEngineObject(rank); SetPosition(4, Math::Vector(35.0f, 0.0f, 0.0f)); SetAngleY(4, -55.0f*Math::PI/180.0f); @@ -2417,7 +2417,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(5, rank); SetObjectParent(5, 1); - pModFile->ReadModel("objects\\portico3.mod"); + pModFile->ReadModel("data/models/portico3.mod"); pModFile->CreateEngineObject(rank); SetPosition(5, Math::Vector(0.0f, 0.0f, 33.0f)); SetAngleY(5, -45.0f*Math::PI/180.0f); @@ -2426,7 +2426,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(6, rank); SetObjectParent(6, 5); - pModFile->ReadModel("objects\\portico4.mod"); + pModFile->ReadModel("data/models/portico4.mod"); pModFile->CreateEngineObject(rank); SetPosition(6, Math::Vector(50.0f, 0.0f, 0.0f)); SetAngleY(6, 60.0f*Math::PI/180.0f); @@ -2435,7 +2435,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(7, rank); SetObjectParent(7, 6); - pModFile->ReadModel("objects\\portico5.mod"); + pModFile->ReadModel("data/models/portico5.mod"); pModFile->CreateEngineObject(rank); SetPosition(7, Math::Vector(35.0f, 0.0f, 0.0f)); SetAngleY(7, 55.0f*Math::PI/180.0f); @@ -2444,7 +2444,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(8, rank); SetObjectParent(8, 0); - pModFile->ReadModel("objects\\portico6.mod"); + pModFile->ReadModel("data/models/portico6.mod"); pModFile->CreateEngineObject(rank); SetPosition(8, Math::Vector(-35.0f, 50.0f, -35.0f)); SetAngleY(8, -Math::PI/2.0f); @@ -2454,7 +2454,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(9, rank); SetObjectParent(9, 8); - pModFile->ReadModel("objects\\portico7.mod"); + pModFile->ReadModel("data/models/portico7.mod"); pModFile->CreateEngineObject(rank); SetPosition(9, Math::Vector(0.0f, 4.5f, 1.9f)); @@ -2462,7 +2462,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(10, rank); SetObjectParent(10, 0); - pModFile->ReadModel("objects\\portico6.mod"); + pModFile->ReadModel("data/models/portico6.mod"); pModFile->CreateEngineObject(rank); SetPosition(10, Math::Vector(-35.0f, 50.0f, 35.0f)); SetAngleY(10, -Math::PI/2.0f); @@ -2472,7 +2472,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(11, rank); SetObjectParent(11, 10); - pModFile->ReadModel("objects\\portico7.mod"); + pModFile->ReadModel("data/models/portico7.mod"); pModFile->CreateEngineObject(rank); SetPosition(11, Math::Vector(0.0f, 4.5f, 1.9f)); @@ -2494,7 +2494,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, if ( m_type == OBJECT_BASE ) { - pModFile->ReadModel("objects\\base1.mod"); + pModFile->ReadModel("data/models/base1.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -2506,7 +2506,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(1+i, rank); SetObjectParent(1+i, 0); - pModFile->ReadModel("objects\\base2.mod"); + pModFile->ReadModel("data/models/base2.mod"); pModFile->CreateEngineObject(rank); p = Math::RotatePoint(-Math::PI/4.0f*i, 27.8f); SetPosition(1+i, Math::Vector(p.x, 30.0f, p.y)); @@ -2517,7 +2517,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(10+i, rank); SetObjectParent(10+i, 1+i); - pModFile->ReadModel("objects\\base4.mod"); + pModFile->ReadModel("data/models/base4.mod"); pModFile->CreateEngineObject(rank); SetPosition(10+i, Math::Vector(23.5f, 0.0f, 7.0f)); @@ -2525,7 +2525,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(18+i, rank); SetObjectParent(18+i, 1+i); - pModFile->ReadModel("objects\\base4.mod"); + pModFile->ReadModel("data/models/base4.mod"); pModFile->Mirror(); pModFile->CreateEngineObject(rank); SetPosition(18+i, Math::Vector(23.5f, 0.0f, -7.0f)); @@ -2535,7 +2535,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(9, rank); SetObjectParent(9, 0); - pModFile->ReadModel("objects\\base3.mod"); // central pillar + pModFile->ReadModel("data/models/base3.mod"); // central pillar pModFile->CreateEngineObject(rank); CreateCrashSphere(Math::Vector( 0.0f, 33.0f, 0.0f), 2.5f, SOUND_BOUMm, 0.45f); @@ -2566,7 +2566,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, if ( m_type == OBJECT_DERRICK ) { - pModFile->ReadModel("objects\\derrick1.mod"); + pModFile->ReadModel("data/models/derrick1.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -2576,7 +2576,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(1, rank); SetObjectParent(1, 0); - pModFile->ReadModel("objects\\derrick2.mod"); + pModFile->ReadModel("data/models/derrick2.mod"); pModFile->CreateEngineObject(rank); CreateCrashSphere(Math::Vector(0.0f, 0.0f, 0.0f), 6.0f, SOUND_BOUMm, 0.45f); @@ -2591,7 +2591,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, if ( m_type == OBJECT_RESEARCH ) { - pModFile->ReadModel("objects\\search1.mod"); + pModFile->ReadModel("data/models/search1.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -2601,7 +2601,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(1, rank); SetObjectParent(1, 0); - pModFile->ReadModel("objects\\search2.mod"); + pModFile->ReadModel("data/models/search2.mod"); pModFile->CreateEngineObject(rank); SetPosition(1, Math::Vector(0.0f, 13.0f, 0.0f)); @@ -2609,7 +2609,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(2, rank); SetObjectParent(2, 1); - pModFile->ReadModel("objects\\search3.mod"); + pModFile->ReadModel("data/models/search3.mod"); pModFile->CreateEngineObject(rank); SetPosition(2, Math::Vector(0.0f, 4.0f, 0.0f)); SetAngleZ(2, 35.0f*Math::PI/180.0f); @@ -2626,7 +2626,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, if ( m_type == OBJECT_RADAR ) { - pModFile->ReadModel("objects\\radar1.mod"); + pModFile->ReadModel("data/models/radar1.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -2636,7 +2636,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(1, rank); SetObjectParent(1, 0); - pModFile->ReadModel("objects\\radar2.mod"); + pModFile->ReadModel("data/models/radar2.mod"); pModFile->CreateEngineObject(rank); SetPosition(1, Math::Vector(0.0f, 5.0f, 0.0f)); @@ -2644,7 +2644,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(2, rank); SetObjectParent(2, 0); - pModFile->ReadModel("objects\\radar3.mod"); + pModFile->ReadModel("data/models/radar3.mod"); pModFile->CreateEngineObject(rank); SetPosition(2, Math::Vector(0.0f, 11.0f, 0.0f)); SetAngleY(2, -Math::PI/2.0f); @@ -2653,7 +2653,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(3, rank); SetObjectParent(3, 2); - pModFile->ReadModel("objects\\radar4.mod"); + pModFile->ReadModel("data/models/radar4.mod"); pModFile->CreateEngineObject(rank); SetPosition(3, Math::Vector(0.0f, 4.5f, 1.9f)); @@ -2666,7 +2666,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, if ( m_type == OBJECT_INFO ) { - pModFile->ReadModel("objects\\info1.mod"); + pModFile->ReadModel("data/models/info1.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -2676,7 +2676,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(1, rank); SetObjectParent(1, 0); - pModFile->ReadModel("objects\\info2.mod"); + pModFile->ReadModel("data/models/info2.mod"); pModFile->CreateEngineObject(rank); SetPosition(1, Math::Vector(0.0f, 5.0f, 0.0f)); @@ -2686,7 +2686,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(2+i*2, rank); SetObjectParent(2+i*2, 1); - pModFile->ReadModel("objects\\info3.mod"); + pModFile->ReadModel("data/models/info3.mod"); pModFile->CreateEngineObject(rank); SetPosition(2+i*2, Math::Vector(0.0f, 4.5f, 0.0f)); @@ -2694,7 +2694,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(3+i*2, rank); SetObjectParent(3+i*2, 2+i*2); - pModFile->ReadModel("objects\\radar4.mod"); + pModFile->ReadModel("data/models/radar4.mod"); pModFile->CreateEngineObject(rank); SetPosition(3+i*2, Math::Vector(0.0f, 0.0f, -4.0f)); @@ -2710,7 +2710,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, if ( m_type == OBJECT_ENERGY ) { - pModFile->ReadModel("objects\\energy.mod"); + pModFile->ReadModel("data/models/energy.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -2729,7 +2729,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, if ( m_type == OBJECT_LABO ) { - pModFile->ReadModel("objects\\labo1.mod"); + pModFile->ReadModel("data/models/labo1.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -2739,7 +2739,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(1, rank); SetObjectParent(1, 0); - pModFile->ReadModel("objects\\labo2.mod"); + pModFile->ReadModel("data/models/labo2.mod"); pModFile->CreateEngineObject(rank); SetPosition(1, Math::Vector(-9.0f, 3.0f, 0.0f)); SetAngleZ(1, Math::PI/2.0f); @@ -2748,7 +2748,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(2, rank); SetObjectParent(2, 1); - pModFile->ReadModel("objects\\labo3.mod"); + pModFile->ReadModel("data/models/labo3.mod"); pModFile->CreateEngineObject(rank); SetPosition(2, Math::Vector(9.0f, -1.0f, 0.0f)); @@ -2756,7 +2756,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(3, rank); SetObjectParent(3, 2); - pModFile->ReadModel("objects\\labo4.mod"); + pModFile->ReadModel("data/models/labo4.mod"); pModFile->CreateEngineObject(rank); SetPosition(3, Math::Vector(0.0f, 0.0f, 0.0f)); SetAngleZ(3, 80.0f*Math::PI/180.0f); @@ -2765,7 +2765,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(4, rank); SetObjectParent(4, 2); - pModFile->ReadModel("objects\\labo4.mod"); + pModFile->ReadModel("data/models/labo4.mod"); pModFile->CreateEngineObject(rank); SetPosition(4, Math::Vector(0.0f, 0.0f, 0.0f)); SetAngleZ(4, 80.0f*Math::PI/180.0f); @@ -2775,7 +2775,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(5, rank); SetObjectParent(5, 2); - pModFile->ReadModel("objects\\labo4.mod"); + pModFile->ReadModel("data/models/labo4.mod"); pModFile->CreateEngineObject(rank); SetPosition(5, Math::Vector(0.0f, 0.0f, 0.0f)); SetAngleZ(5, 80.0f*Math::PI/180.0f); @@ -2795,7 +2795,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, if ( m_type == OBJECT_FACTORY ) { - pModFile->ReadModel("objects\\factory1.mod"); + pModFile->ReadModel("data/models/factory1.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -2807,7 +2807,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(1+i, rank); SetObjectParent(1+i, 0); - pModFile->ReadModel("objects\\factory2.mod"); + pModFile->ReadModel("data/models/factory2.mod"); pModFile->CreateEngineObject(rank); SetPosition(1+i, Math::Vector(10.0f, 2.0f*i, 10.0f)); SetAngleZ(1+i, Math::PI/2.0f); @@ -2817,7 +2817,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(10+i, rank); SetObjectParent(10+i, 0); - pModFile->ReadModel("objects\\factory2.mod"); + pModFile->ReadModel("data/models/factory2.mod"); pModFile->CreateEngineObject(rank); SetPosition(10+i, Math::Vector(10.0f, 2.0f*i, -10.0f)); SetAngleZ(10+i, -Math::PI/2.0f); @@ -2855,7 +2855,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, if ( m_type == OBJECT_REPAIR ) { - pModFile->ReadModel("objects\\repair1.mod"); + pModFile->ReadModel("data/models/repair1.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -2865,7 +2865,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(1, rank); SetObjectParent(1, 0); - pModFile->ReadModel("objects\\repair2.mod"); + pModFile->ReadModel("data/models/repair2.mod"); pModFile->CreateEngineObject(rank); SetPosition(1, Math::Vector(-11.0f, 13.5f, 0.0f)); SetAngleZ(1, Math::PI/2.0f); @@ -2881,7 +2881,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, if ( m_type == OBJECT_DESTROYER ) { - pModFile->ReadModel("objects\\destroy1.mod"); + pModFile->ReadModel("data/models/destroy1.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -2891,7 +2891,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(1, rank); SetObjectParent(1, 0); - pModFile->ReadModel("objects\\destroy2.mod"); + pModFile->ReadModel("data/models/destroy2.mod"); pModFile->CreateEngineObject(rank); SetPosition(1, Math::Vector(0.0f, 0.0f, 0.0f)); @@ -2907,7 +2907,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, if ( m_type == OBJECT_STATION ) { - pModFile->ReadModel("objects\\station.mod"); + pModFile->ReadModel("data/models/station.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -2924,7 +2924,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, if ( m_type == OBJECT_CONVERT ) { - pModFile->ReadModel("objects\\convert1.mod"); + pModFile->ReadModel("data/models/convert1.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -2934,7 +2934,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(1, rank); SetObjectParent(1, 0); - pModFile->ReadModel("objects\\convert2.mod"); + pModFile->ReadModel("data/models/convert2.mod"); pModFile->CreateEngineObject(rank); SetPosition(1, Math::Vector(0.0f, 14.0f, 0.0f)); @@ -2942,7 +2942,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(2, rank); SetObjectParent(2, 0); - pModFile->ReadModel("objects\\convert3.mod"); + pModFile->ReadModel("data/models/convert3.mod"); pModFile->CreateEngineObject(rank); SetPosition(2, Math::Vector(0.0f, 11.5f, 0.0f)); SetAngleX(2, -Math::PI*0.35f); @@ -2951,7 +2951,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(3, rank); SetObjectParent(3, 0); - pModFile->ReadModel("objects\\convert3.mod"); + pModFile->ReadModel("data/models/convert3.mod"); pModFile->CreateEngineObject(rank); SetPosition(3, Math::Vector(0.0f, 11.5f, 0.0f)); SetAngleY(3, Math::PI); @@ -2968,7 +2968,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, if ( m_type == OBJECT_TOWER ) { - pModFile->ReadModel("objects\\tower.mod"); + pModFile->ReadModel("data/models/tower.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -2978,7 +2978,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(1, rank); SetObjectParent(1, 0); - pModFile->ReadModel("objects\\roller2c.mod"); + pModFile->ReadModel("data/models/roller2c.mod"); pModFile->CreateEngineObject(rank); SetPosition(1, Math::Vector(0.0f, 20.0f, 0.0f)); SetAngleZ(1, Math::PI/2.0f); @@ -2987,7 +2987,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(2, rank); SetObjectParent(2, 1); - pModFile->ReadModel("objects\\roller3c.mod"); + pModFile->ReadModel("data/models/roller3c.mod"); pModFile->CreateEngineObject(rank); SetPosition(2, Math::Vector(4.5f, 0.0f, 0.0f)); SetAngleZ(2, 0.0f); @@ -3006,7 +3006,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, if ( m_type == OBJECT_NUCLEAR ) { - pModFile->ReadModel("objects\\nuclear1.mod"); + pModFile->ReadModel("data/models/nuclear1.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3016,7 +3016,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(1, rank); SetObjectParent(1, 0); - pModFile->ReadModel("objects\\nuclear2.mod"); + pModFile->ReadModel("data/models/nuclear2.mod"); pModFile->CreateEngineObject(rank); SetPosition(1, Math::Vector(20.0f, 10.0f, 0.0f)); SetAngleZ(1, 135.0f*Math::PI/180.0f); @@ -3033,7 +3033,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, if ( m_type == OBJECT_PARA ) { - pModFile->ReadModel("objects\\para.mod"); + pModFile->ReadModel("data/models/para.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3059,7 +3059,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, if ( m_type == OBJECT_SAFE ) { - pModFile->ReadModel("objects\\safe1.mod"); + pModFile->ReadModel("data/models/safe1.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3069,7 +3069,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(1, rank); SetObjectParent(1, 0); - pModFile->ReadModel("objects\\safe2.mod"); + pModFile->ReadModel("data/models/safe2.mod"); pModFile->CreateEngineObject(rank); SetZoom(1, 1.05f); @@ -3077,7 +3077,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(2, rank); SetObjectParent(2, 0); - pModFile->ReadModel("objects\\safe3.mod"); + pModFile->ReadModel("data/models/safe3.mod"); pModFile->CreateEngineObject(rank); SetZoom(2, 1.05f); @@ -3091,7 +3091,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, if ( m_type == OBJECT_HUSTON ) { - pModFile->ReadModel("objects\\huston1.mod"); + pModFile->ReadModel("data/models/huston1.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3101,7 +3101,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(1, rank); SetObjectParent(1, 0); - pModFile->ReadModel("objects\\huston2.mod"); + pModFile->ReadModel("data/models/huston2.mod"); pModFile->CreateEngineObject(rank); SetPosition(1, Math::Vector(0.0f, 39.0f, 30.0f)); SetAngleY(1, -Math::PI/2.0f); @@ -3111,7 +3111,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(2, rank); SetObjectParent(2, 1); - pModFile->ReadModel("objects\\huston3.mod"); + pModFile->ReadModel("data/models/huston3.mod"); pModFile->CreateEngineObject(rank); SetPosition(2, Math::Vector(0.0f, 4.5f, 1.9f)); @@ -3135,7 +3135,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, if ( m_type == OBJECT_TARGET1 ) { - pModFile->ReadModel("objects\\target1.mod"); + pModFile->ReadModel("data/models/target1.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3165,7 +3165,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, if ( m_type == OBJECT_TARGET2 ) { - pModFile->ReadModel("objects\\target2.mod"); + pModFile->ReadModel("data/models/target2.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3176,7 +3176,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, if ( m_type == OBJECT_NEST ) { - pModFile->ReadModel("objects\\nest.mod"); + pModFile->ReadModel("data/models/nest.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3189,7 +3189,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, if ( m_type == OBJECT_START ) { - pModFile->ReadModel("objects\\start.mod"); + pModFile->ReadModel("data/models/start.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3200,7 +3200,7 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, if ( m_type == OBJECT_END ) { - pModFile->ReadModel("objects\\end.mod"); + pModFile->ReadModel("data/models/end.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3221,8 +3221,8 @@ bool CObject::CreateBuilding(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); pPower->SetObjectRank(0, rank); - if ( power <= 1.0f ) pModFile->ReadModel("objects\\power.mod"); - else pModFile->ReadModel("objects\\atomic.mod"); + if ( power <= 1.0f ) pModFile->ReadModel("data/models/power.mod"); + else pModFile->ReadModel("data/models/atomic.mod"); pModFile->CreateEngineObject(rank); pPower->SetPosition(0, GetCharacter()->posPower); @@ -3268,36 +3268,36 @@ bool CObject::CreateResource(Math::Vector pos, float angle, ObjectType type, SetEnergy(power); name[0] = 0; - if ( type == OBJECT_STONE ) strcpy(name, "objects\\stone.mod"); - if ( type == OBJECT_URANIUM ) strcpy(name, "objects\\uranium.mod"); - if ( type == OBJECT_METAL ) strcpy(name, "objects\\metal.mod"); - if ( type == OBJECT_POWER ) strcpy(name, "objects\\power.mod"); - if ( type == OBJECT_ATOMIC ) strcpy(name, "objects\\atomic.mod"); - if ( type == OBJECT_BULLET ) strcpy(name, "objects\\bullet.mod"); - if ( type == OBJECT_BBOX ) strcpy(name, "objects\\bbox.mod"); - if ( type == OBJECT_KEYa ) strcpy(name, "objects\\keya.mod"); - if ( type == OBJECT_KEYb ) strcpy(name, "objects\\keyb.mod"); - if ( type == OBJECT_KEYc ) strcpy(name, "objects\\keyc.mod"); - if ( type == OBJECT_KEYd ) strcpy(name, "objects\\keyd.mod"); - if ( type == OBJECT_TNT ) strcpy(name, "objects\\tnt.mod"); - if ( type == OBJECT_SCRAP1 ) strcpy(name, "objects\\scrap1.mod"); - if ( type == OBJECT_SCRAP2 ) strcpy(name, "objects\\scrap2.mod"); - if ( type == OBJECT_SCRAP3 ) strcpy(name, "objects\\scrap3.mod"); - if ( type == OBJECT_SCRAP4 ) strcpy(name, "objects\\scrap4.mod"); - if ( type == OBJECT_SCRAP5 ) strcpy(name, "objects\\scrap5.mod"); - if ( type == OBJECT_BOMB ) strcpy(name, "objects\\bomb.mod"); - if ( type == OBJECT_WAYPOINT ) strcpy(name, "objects\\waypoint.mod"); - if ( type == OBJECT_SHOW ) strcpy(name, "objects\\show.mod"); - if ( type == OBJECT_WINFIRE ) strcpy(name, "objects\\winfire.mod"); - if ( type == OBJECT_BAG ) strcpy(name, "objects\\bag.mod"); - if ( type == OBJECT_MARKSTONE ) strcpy(name, "objects\\cross1.mod"); - if ( type == OBJECT_MARKURANIUM ) strcpy(name, "objects\\cross3.mod"); - if ( type == OBJECT_MARKPOWER ) strcpy(name, "objects\\cross2.mod"); - if ( type == OBJECT_MARKKEYa ) strcpy(name, "objects\\crossa.mod"); - if ( type == OBJECT_MARKKEYb ) strcpy(name, "objects\\crossb.mod"); - if ( type == OBJECT_MARKKEYc ) strcpy(name, "objects\\crossc.mod"); - if ( type == OBJECT_MARKKEYd ) strcpy(name, "objects\\crossd.mod"); - if ( type == OBJECT_EGG ) strcpy(name, "objects\\egg.mod"); + if ( type == OBJECT_STONE ) strcpy(name, "data/models/stone.mod"); + if ( type == OBJECT_URANIUM ) strcpy(name, "data/models/uranium.mod"); + if ( type == OBJECT_METAL ) strcpy(name, "data/models/metal.mod"); + if ( type == OBJECT_POWER ) strcpy(name, "data/models/power.mod"); + if ( type == OBJECT_ATOMIC ) strcpy(name, "data/models/atomic.mod"); + if ( type == OBJECT_BULLET ) strcpy(name, "data/models/bullet.mod"); + if ( type == OBJECT_BBOX ) strcpy(name, "data/models/bbox.mod"); + if ( type == OBJECT_KEYa ) strcpy(name, "data/models/keya.mod"); + if ( type == OBJECT_KEYb ) strcpy(name, "data/models/keyb.mod"); + if ( type == OBJECT_KEYc ) strcpy(name, "data/models/keyc.mod"); + if ( type == OBJECT_KEYd ) strcpy(name, "data/models/keyd.mod"); + if ( type == OBJECT_TNT ) strcpy(name, "data/models/tnt.mod"); + if ( type == OBJECT_SCRAP1 ) strcpy(name, "data/models/scrap1.mod"); + if ( type == OBJECT_SCRAP2 ) strcpy(name, "data/models/scrap2.mod"); + if ( type == OBJECT_SCRAP3 ) strcpy(name, "data/models/scrap3.mod"); + if ( type == OBJECT_SCRAP4 ) strcpy(name, "data/models/scrap4.mod"); + if ( type == OBJECT_SCRAP5 ) strcpy(name, "data/models/scrap5.mod"); + if ( type == OBJECT_BOMB ) strcpy(name, "data/models/bomb.mod"); + if ( type == OBJECT_WAYPOINT ) strcpy(name, "data/models/waypoint.mod"); + if ( type == OBJECT_SHOW ) strcpy(name, "data/models/show.mod"); + if ( type == OBJECT_WINFIRE ) strcpy(name, "data/models/winfire.mod"); + if ( type == OBJECT_BAG ) strcpy(name, "data/models/bag.mod"); + if ( type == OBJECT_MARKSTONE ) strcpy(name, "data/models/cross1.mod"); + if ( type == OBJECT_MARKURANIUM ) strcpy(name, "data/models/cross3.mod"); + if ( type == OBJECT_MARKPOWER ) strcpy(name, "data/models/cross2.mod"); + if ( type == OBJECT_MARKKEYa ) strcpy(name, "data/models/crossa.mod"); + if ( type == OBJECT_MARKKEYb ) strcpy(name, "data/models/crossb.mod"); + if ( type == OBJECT_MARKKEYc ) strcpy(name, "data/models/crossc.mod"); + if ( type == OBJECT_MARKKEYd ) strcpy(name, "data/models/crossd.mod"); + if ( type == OBJECT_EGG ) strcpy(name, "data/models/egg.mod"); pModFile->ReadModel(name); pModFile->CreateEngineObject(rank); @@ -3377,11 +3377,11 @@ bool CObject::CreateFlag(Math::Vector pos, float angle, ObjectType type) SetType(type); name[0] = 0; - if ( type == OBJECT_FLAGb ) strcpy(name, "objects\\flag1b.mod"); - if ( type == OBJECT_FLAGr ) strcpy(name, "objects\\flag1r.mod"); - if ( type == OBJECT_FLAGg ) strcpy(name, "objects\\flag1g.mod"); - if ( type == OBJECT_FLAGy ) strcpy(name, "objects\\flag1y.mod"); - if ( type == OBJECT_FLAGv ) strcpy(name, "objects\\flag1v.mod"); + if ( type == OBJECT_FLAGb ) strcpy(name, "data/models/flag1b.mod"); + if ( type == OBJECT_FLAGr ) strcpy(name, "data/models/flag1r.mod"); + if ( type == OBJECT_FLAGg ) strcpy(name, "data/models/flag1g.mod"); + if ( type == OBJECT_FLAGy ) strcpy(name, "data/models/flag1y.mod"); + if ( type == OBJECT_FLAGv ) strcpy(name, "data/models/flag1v.mod"); rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); // it is a stationary object @@ -3392,11 +3392,11 @@ bool CObject::CreateFlag(Math::Vector pos, float angle, ObjectType type) SetAngleY(0, angle); name[0] = 0; - if ( type == OBJECT_FLAGb ) strcpy(name, "objects\\flag2b.mod"); - if ( type == OBJECT_FLAGr ) strcpy(name, "objects\\flag2r.mod"); - if ( type == OBJECT_FLAGg ) strcpy(name, "objects\\flag2g.mod"); - if ( type == OBJECT_FLAGy ) strcpy(name, "objects\\flag2y.mod"); - if ( type == OBJECT_FLAGv ) strcpy(name, "objects\\flag2v.mod"); + if ( type == OBJECT_FLAGb ) strcpy(name, "data/models/flag2b.mod"); + if ( type == OBJECT_FLAGr ) strcpy(name, "data/models/flag2r.mod"); + if ( type == OBJECT_FLAGg ) strcpy(name, "data/models/flag2g.mod"); + if ( type == OBJECT_FLAGy ) strcpy(name, "data/models/flag2y.mod"); + if ( type == OBJECT_FLAGv ) strcpy(name, "data/models/flag2v.mod"); for ( i=0 ; i<4 ; i++ ) { @@ -3442,7 +3442,7 @@ bool CObject::CreateBarrier(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\barrier0.mod"); + pModFile->ReadModel("data/models/barrier0.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3459,7 +3459,7 @@ bool CObject::CreateBarrier(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\barrier1.mod"); + pModFile->ReadModel("data/models/barrier1.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3478,7 +3478,7 @@ bool CObject::CreateBarrier(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\barrier2.mod"); + pModFile->ReadModel("data/models/barrier2.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3497,7 +3497,7 @@ bool CObject::CreateBarrier(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\barrier3.mod"); + pModFile->ReadModel("data/models/barrier3.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3547,11 +3547,11 @@ bool CObject::CreatePlant(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - if ( type == OBJECT_PLANT0 ) pModFile->ReadModel("objects\\plant0.mod"); - if ( type == OBJECT_PLANT1 ) pModFile->ReadModel("objects\\plant1.mod"); - if ( type == OBJECT_PLANT2 ) pModFile->ReadModel("objects\\plant2.mod"); - if ( type == OBJECT_PLANT3 ) pModFile->ReadModel("objects\\plant3.mod"); - if ( type == OBJECT_PLANT4 ) pModFile->ReadModel("objects\\plant4.mod"); + if ( type == OBJECT_PLANT0 ) pModFile->ReadModel("data/models/plant0.mod"); + if ( type == OBJECT_PLANT1 ) pModFile->ReadModel("data/models/plant1.mod"); + if ( type == OBJECT_PLANT2 ) pModFile->ReadModel("data/models/plant2.mod"); + if ( type == OBJECT_PLANT3 ) pModFile->ReadModel("data/models/plant3.mod"); + if ( type == OBJECT_PLANT4 ) pModFile->ReadModel("data/models/plant4.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3572,9 +3572,9 @@ bool CObject::CreatePlant(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - if ( type == OBJECT_PLANT5 ) pModFile->ReadModel("objects\\plant5.mod"); - if ( type == OBJECT_PLANT6 ) pModFile->ReadModel("objects\\plant6.mod"); - if ( type == OBJECT_PLANT7 ) pModFile->ReadModel("objects\\plant7.mod"); + if ( type == OBJECT_PLANT5 ) pModFile->ReadModel("data/models/plant5.mod"); + if ( type == OBJECT_PLANT6 ) pModFile->ReadModel("data/models/plant6.mod"); + if ( type == OBJECT_PLANT7 ) pModFile->ReadModel("data/models/plant7.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3591,8 +3591,8 @@ bool CObject::CreatePlant(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - if ( type == OBJECT_PLANT8 ) pModFile->ReadModel("objects\\plant8.mod"); - if ( type == OBJECT_PLANT9 ) pModFile->ReadModel("objects\\plant9.mod"); + if ( type == OBJECT_PLANT8 ) pModFile->ReadModel("data/models/plant8.mod"); + if ( type == OBJECT_PLANT9 ) pModFile->ReadModel("data/models/plant9.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3612,11 +3612,11 @@ bool CObject::CreatePlant(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - if ( type == OBJECT_PLANT10 ) pModFile->ReadModel("objects\\plant10.mod"); - if ( type == OBJECT_PLANT11 ) pModFile->ReadModel("objects\\plant11.mod"); - if ( type == OBJECT_PLANT12 ) pModFile->ReadModel("objects\\plant12.mod"); - if ( type == OBJECT_PLANT13 ) pModFile->ReadModel("objects\\plant13.mod"); - if ( type == OBJECT_PLANT14 ) pModFile->ReadModel("objects\\plant14.mod"); + if ( type == OBJECT_PLANT10 ) pModFile->ReadModel("data/models/plant10.mod"); + if ( type == OBJECT_PLANT11 ) pModFile->ReadModel("data/models/plant11.mod"); + if ( type == OBJECT_PLANT12 ) pModFile->ReadModel("data/models/plant12.mod"); + if ( type == OBJECT_PLANT13 ) pModFile->ReadModel("data/models/plant13.mod"); + if ( type == OBJECT_PLANT14 ) pModFile->ReadModel("data/models/plant14.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3637,11 +3637,11 @@ bool CObject::CreatePlant(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - if ( type == OBJECT_PLANT15 ) pModFile->ReadModel("objects\\plant15.mod"); - if ( type == OBJECT_PLANT16 ) pModFile->ReadModel("objects\\plant16.mod"); - if ( type == OBJECT_PLANT17 ) pModFile->ReadModel("objects\\plant17.mod"); - if ( type == OBJECT_PLANT18 ) pModFile->ReadModel("objects\\plant18.mod"); - if ( type == OBJECT_PLANT19 ) pModFile->ReadModel("objects\\plant19.mod"); + if ( type == OBJECT_PLANT15 ) pModFile->ReadModel("data/models/plant15.mod"); + if ( type == OBJECT_PLANT16 ) pModFile->ReadModel("data/models/plant16.mod"); + if ( type == OBJECT_PLANT17 ) pModFile->ReadModel("data/models/plant17.mod"); + if ( type == OBJECT_PLANT18 ) pModFile->ReadModel("data/models/plant18.mod"); + if ( type == OBJECT_PLANT19 ) pModFile->ReadModel("data/models/plant19.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3661,7 +3661,7 @@ bool CObject::CreatePlant(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\tree0.mod"); + pModFile->ReadModel("data/models/tree0.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3679,7 +3679,7 @@ bool CObject::CreatePlant(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\tree1.mod"); + pModFile->ReadModel("data/models/tree1.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3698,7 +3698,7 @@ bool CObject::CreatePlant(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\tree2.mod"); + pModFile->ReadModel("data/models/tree2.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3717,7 +3717,7 @@ bool CObject::CreatePlant(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\tree3.mod"); + pModFile->ReadModel("data/models/tree3.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3735,7 +3735,7 @@ bool CObject::CreatePlant(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\tree4.mod"); + pModFile->ReadModel("data/models/tree4.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3752,7 +3752,7 @@ bool CObject::CreatePlant(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\tree5.mod"); + pModFile->ReadModel("data/models/tree5.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3795,7 +3795,7 @@ bool CObject::CreateMushroom(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\mush1.mod"); + pModFile->ReadModel("data/models/mush1.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3812,7 +3812,7 @@ bool CObject::CreateMushroom(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\mush2.mod"); + pModFile->ReadModel("data/models/mush2.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3861,7 +3861,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen0.mod"); + pModFile->ReadModel("data/models/teen0.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3881,7 +3881,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen1.mod"); + pModFile->ReadModel("data/models/teen1.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3903,7 +3903,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen2.mod"); + pModFile->ReadModel("data/models/teen2.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3926,7 +3926,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height //? m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_METAL); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen3.mod"); + pModFile->ReadModel("data/models/teen3.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3942,7 +3942,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen4.mod"); + pModFile->ReadModel("data/models/teen4.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3964,7 +3964,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen5.mod"); + pModFile->ReadModel("data/models/teen5.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -3981,7 +3981,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen6.mod"); + pModFile->ReadModel("data/models/teen6.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4002,7 +4002,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen7.mod"); + pModFile->ReadModel("data/models/teen7.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4023,7 +4023,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen8.mod"); + pModFile->ReadModel("data/models/teen8.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4045,7 +4045,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen9.mod"); + pModFile->ReadModel("data/models/teen9.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4067,7 +4067,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen10.mod"); + pModFile->ReadModel("data/models/teen10.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4093,7 +4093,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen11.mod"); + pModFile->ReadModel("data/models/teen11.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4118,7 +4118,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height //? m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_METAL); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen12.mod"); + pModFile->ReadModel("data/models/teen12.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4134,7 +4134,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen13.mod"); + pModFile->ReadModel("data/models/teen13.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4159,7 +4159,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen14.mod"); + pModFile->ReadModel("data/models/teen14.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4184,7 +4184,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen15.mod"); + pModFile->ReadModel("data/models/teen15.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4209,7 +4209,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen16.mod"); + pModFile->ReadModel("data/models/teen16.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4227,7 +4227,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen17.mod"); + pModFile->ReadModel("data/models/teen17.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4243,7 +4243,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen18.mod"); + pModFile->ReadModel("data/models/teen18.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4259,7 +4259,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen19.mod"); + pModFile->ReadModel("data/models/teen19.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4275,7 +4275,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen20.mod"); + pModFile->ReadModel("data/models/teen20.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4296,7 +4296,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen21.mod"); + pModFile->ReadModel("data/models/teen21.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4308,7 +4308,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen22.mod"); + pModFile->ReadModel("data/models/teen22.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4325,7 +4325,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen23.mod"); + pModFile->ReadModel("data/models/teen23.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4352,7 +4352,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen24.mod"); + pModFile->ReadModel("data/models/teen24.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4368,7 +4368,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen25.mod"); + pModFile->ReadModel("data/models/teen25.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4384,7 +4384,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen26.mod"); + pModFile->ReadModel("data/models/teen26.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4408,7 +4408,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen27.mod"); + pModFile->ReadModel("data/models/teen27.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4424,7 +4424,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height //? m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_METAL); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen28.mod"); + pModFile->ReadModel("data/models/teen28.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4439,7 +4439,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen29.mod"); + pModFile->ReadModel("data/models/teen29.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4452,7 +4452,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen30.mod"); + pModFile->ReadModel("data/models/teen30.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4468,7 +4468,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen31.mod"); + pModFile->ReadModel("data/models/teen31.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4487,7 +4487,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen32.mod"); + pModFile->ReadModel("data/models/teen32.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4506,7 +4506,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen33.mod"); + pModFile->ReadModel("data/models/teen33.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4521,7 +4521,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen34.mod"); + pModFile->ReadModel("data/models/teen34.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4536,7 +4536,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen35.mod"); + pModFile->ReadModel("data/models/teen35.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4555,7 +4555,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen36.mod"); + pModFile->ReadModel("data/models/teen36.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4568,7 +4568,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen37.mod"); + pModFile->ReadModel("data/models/teen37.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4581,7 +4581,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen38a.mod"); + pModFile->ReadModel("data/models/teen38a.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4591,7 +4591,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(1, rank); SetObjectParent(1, 0); - pModFile->ReadModel("objects\\teen38b.mod"); // engine + pModFile->ReadModel("data/models/teen38b.mod"); // engine pModFile->CreateEngineObject(rank); SetPosition(1, Math::Vector(0.0f, 30.0f, 0.0f)); @@ -4599,7 +4599,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(2, rank); SetObjectParent(2, 1); - pModFile->ReadModel("objects\\teen38c.mod"); // propeller + pModFile->ReadModel("data/models/teen38c.mod"); // propeller pModFile->CreateEngineObject(rank); SetPosition(2, Math::Vector(0.0f, 0.0f, 0.0f)); @@ -4613,7 +4613,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen39.mod"); + pModFile->ReadModel("data/models/teen39.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4629,7 +4629,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen40.mod"); + pModFile->ReadModel("data/models/teen40.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4645,7 +4645,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen41.mod"); + pModFile->ReadModel("data/models/teen41.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4657,7 +4657,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen42.mod"); + pModFile->ReadModel("data/models/teen42.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4672,7 +4672,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen43.mod"); + pModFile->ReadModel("data/models/teen43.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4687,7 +4687,7 @@ bool CObject::CreateTeen(Math::Vector pos, float angle, float zoom, float height rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\teen44.mod"); + pModFile->ReadModel("data/models/teen44.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4735,7 +4735,7 @@ bool CObject::CreateQuartz(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_QUARTZ); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\quartz0.mod"); + pModFile->ReadModel("data/models/quartz0.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4750,7 +4750,7 @@ bool CObject::CreateQuartz(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_QUARTZ); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\quartz1.mod"); + pModFile->ReadModel("data/models/quartz1.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4765,7 +4765,7 @@ bool CObject::CreateQuartz(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_QUARTZ); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\quartz2.mod"); + pModFile->ReadModel("data/models/quartz2.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4780,7 +4780,7 @@ bool CObject::CreateQuartz(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_QUARTZ); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\quartz3.mod"); + pModFile->ReadModel("data/models/quartz3.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4845,7 +4845,7 @@ bool CObject::CreateRoot(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\root0.mod"); + pModFile->ReadModel("data/models/root0.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4867,7 +4867,7 @@ bool CObject::CreateRoot(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\root1.mod"); + pModFile->ReadModel("data/models/root1.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4889,7 +4889,7 @@ bool CObject::CreateRoot(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\root2.mod"); + pModFile->ReadModel("data/models/root2.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4910,7 +4910,7 @@ bool CObject::CreateRoot(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\root3.mod"); + pModFile->ReadModel("data/models/root3.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4933,7 +4933,7 @@ bool CObject::CreateRoot(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\root4.mod"); + pModFile->ReadModel("data/models/root4.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4958,7 +4958,7 @@ bool CObject::CreateRoot(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\root4.mod"); + pModFile->ReadModel("data/models/root4.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -4968,7 +4968,7 @@ bool CObject::CreateRoot(Math::Vector pos, float angle, float height, m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(1, rank); SetObjectParent(1, 0); - pModFile->ReadModel("objects\\root5.mod"); + pModFile->ReadModel("data/models/root5.mod"); pModFile->CreateEngineObject(rank); SetPosition(1, Math::Vector(-5.0f, 28.0f, -4.0f)); SetAngleX(1, -30.0f*Math::PI/180.0f); @@ -5020,7 +5020,7 @@ bool CObject::CreateHome(Math::Vector pos, float angle, float height, rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); SetObjectRank(0, rank); - pModFile->ReadModel("objects\\home1.mod"); + pModFile->ReadModel("data/models/home1.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -5063,19 +5063,19 @@ bool CObject::CreateRuin(Math::Vector pos, float angle, float height, SetObjectRank(0, rank); name[0] = 0; - if ( type == OBJECT_RUINmobilew1 ) strcpy(name, "objects\\ruin1.mod"); - if ( type == OBJECT_RUINmobilew2 ) strcpy(name, "objects\\ruin1.mod"); - if ( type == OBJECT_RUINmobilet1 ) strcpy(name, "objects\\ruin2.mod"); - if ( type == OBJECT_RUINmobilet2 ) strcpy(name, "objects\\ruin2.mod"); - if ( type == OBJECT_RUINmobiler1 ) strcpy(name, "objects\\ruin3.mod"); - if ( type == OBJECT_RUINmobiler2 ) strcpy(name, "objects\\ruin3.mod"); - if ( type == OBJECT_RUINfactory ) strcpy(name, "objects\\ruin4.mod"); - if ( type == OBJECT_RUINdoor ) strcpy(name, "objects\\ruin5.mod"); - if ( type == OBJECT_RUINsupport ) strcpy(name, "objects\\ruin6.mod"); - if ( type == OBJECT_RUINradar ) strcpy(name, "objects\\ruin7.mod"); - if ( type == OBJECT_RUINconvert ) strcpy(name, "objects\\ruin8.mod"); - if ( type == OBJECT_RUINbase ) strcpy(name, "objects\\ruin9.mod"); - if ( type == OBJECT_RUINhead ) strcpy(name, "objects\\ruin10.mod"); + if ( type == OBJECT_RUINmobilew1 ) strcpy(name, "data/models/ruin1.mod"); + if ( type == OBJECT_RUINmobilew2 ) strcpy(name, "data/models/ruin1.mod"); + if ( type == OBJECT_RUINmobilet1 ) strcpy(name, "data/models/ruin2.mod"); + if ( type == OBJECT_RUINmobilet2 ) strcpy(name, "data/models/ruin2.mod"); + if ( type == OBJECT_RUINmobiler1 ) strcpy(name, "data/models/ruin3.mod"); + if ( type == OBJECT_RUINmobiler2 ) strcpy(name, "data/models/ruin3.mod"); + if ( type == OBJECT_RUINfactory ) strcpy(name, "data/models/ruin4.mod"); + if ( type == OBJECT_RUINdoor ) strcpy(name, "data/models/ruin5.mod"); + if ( type == OBJECT_RUINsupport ) strcpy(name, "data/models/ruin6.mod"); + if ( type == OBJECT_RUINradar ) strcpy(name, "data/models/ruin7.mod"); + if ( type == OBJECT_RUINconvert ) strcpy(name, "data/models/ruin8.mod"); + if ( type == OBJECT_RUINbase ) strcpy(name, "data/models/ruin9.mod"); + if ( type == OBJECT_RUINhead ) strcpy(name, "data/models/ruin10.mod"); pModFile->ReadModel(name); pModFile->CreateEngineObject(rank); @@ -5091,7 +5091,7 @@ bool CObject::CreateRuin(Math::Vector pos, float angle, float height, SetObjectRank(6, rank); SetObjectParent(6, 0); - pModFile->ReadModel("objects\\ruin1w.mod"); + pModFile->ReadModel("data/models/ruin1w.mod"); pModFile->CreateEngineObject(rank); SetPosition(6, Math::Vector(-3.0f, 1.8f, -4.0f)); @@ -5103,7 +5103,7 @@ bool CObject::CreateRuin(Math::Vector pos, float angle, float height, SetObjectRank(7, rank); SetObjectParent(7, 0); - pModFile->ReadModel("objects\\ruin1w.mod"); + pModFile->ReadModel("data/models/ruin1w.mod"); pModFile->CreateEngineObject(rank); SetPosition(7, Math::Vector(-3.0f, 1.0f, 3.0f)); @@ -5116,7 +5116,7 @@ bool CObject::CreateRuin(Math::Vector pos, float angle, float height, SetObjectRank(8, rank); SetObjectParent(8, 0); - pModFile->ReadModel("objects\\ruin1w.mod"); + pModFile->ReadModel("data/models/ruin1w.mod"); pModFile->CreateEngineObject(rank); SetPosition(8, Math::Vector(2.0f, 1.6f, -3.0f)); @@ -5128,7 +5128,7 @@ bool CObject::CreateRuin(Math::Vector pos, float angle, float height, SetObjectRank(9, rank); SetObjectParent(9, 0); - pModFile->ReadModel("objects\\ruin1w.mod"); + pModFile->ReadModel("data/models/ruin1w.mod"); pModFile->CreateEngineObject(rank); SetPosition(9, Math::Vector(2.0f, 1.0f, 3.0f)); @@ -5149,7 +5149,7 @@ bool CObject::CreateRuin(Math::Vector pos, float angle, float height, SetObjectRank(7, rank); SetObjectParent(7, 0); - pModFile->ReadModel("objects\\ruin1w.mod"); + pModFile->ReadModel("data/models/ruin1w.mod"); pModFile->CreateEngineObject(rank); SetPosition(7, Math::Vector(-3.0f, 1.0f, 3.0f)); @@ -5162,7 +5162,7 @@ bool CObject::CreateRuin(Math::Vector pos, float angle, float height, SetObjectRank(9, rank); SetObjectParent(9, 0); - pModFile->ReadModel("objects\\ruin1w.mod"); + pModFile->ReadModel("data/models/ruin1w.mod"); pModFile->CreateEngineObject(rank); SetPosition(9, Math::Vector(2.0f, 1.0f, 3.0f)); @@ -5183,7 +5183,7 @@ bool CObject::CreateRuin(Math::Vector pos, float angle, float height, SetObjectRank(1, rank); SetObjectParent(1, 0); - pModFile->ReadModel("objects\\ruin2c.mod"); + pModFile->ReadModel("data/models/ruin2c.mod"); pModFile->CreateEngineObject(rank); SetPosition(1, Math::Vector(3.0f, 5.0f, -2.5f)); @@ -5486,7 +5486,7 @@ bool CObject::CreateApollo(Math::Vector pos, float angle, ObjectType type) rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); // it is a stationary object SetObjectRank(0, rank); - pModFile->ReadModel("objects\\apollol1.mod"); + pModFile->ReadModel("data/models/apollol1.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -5499,7 +5499,7 @@ bool CObject::CreateApollo(Math::Vector pos, float angle, ObjectType type) m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(i+1, rank); SetObjectParent(i+1, 0); - pModFile->ReadModel("objects\\apollol2.mod"); + pModFile->ReadModel("data/models/apollol2.mod"); pModFile->CreateEngineObject(rank); SetAngleY(i+1, Math::PI/2.0f*i); } @@ -5508,7 +5508,7 @@ bool CObject::CreateApollo(Math::Vector pos, float angle, ObjectType type) m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(5, rank); SetObjectParent(5, 0); - pModFile->ReadModel("objects\\apollol3.mod"); // ladder + pModFile->ReadModel("data/models/apollol3.mod"); // ladder pModFile->CreateEngineObject(rank); //? m_terrain->AddBuildingLevel(pos, 10.0f, 13.0f, 12.0f, 0.0f); @@ -5529,7 +5529,7 @@ bool CObject::CreateApollo(Math::Vector pos, float angle, ObjectType type) rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); //it is a stationary object SetObjectRank(0, rank); - pModFile->ReadModel("objects\\apolloj1.mod"); + pModFile->ReadModel("data/models/apolloj1.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -5540,7 +5540,7 @@ bool CObject::CreateApollo(Math::Vector pos, float angle, ObjectType type) m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(1, rank); SetObjectParent(1, 0); - pModFile->ReadModel("objects\\apolloj4.mod"); // wheel + pModFile->ReadModel("data/models/apolloj4.mod"); // wheel pModFile->CreateEngineObject(rank); SetPosition(1, Math::Vector(-5.75f, 1.65f, -5.0f)); @@ -5548,7 +5548,7 @@ bool CObject::CreateApollo(Math::Vector pos, float angle, ObjectType type) m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(2, rank); SetObjectParent(2, 0); - pModFile->ReadModel("objects\\apolloj4.mod"); // wheel + pModFile->ReadModel("data/models/apolloj4.mod"); // wheel pModFile->CreateEngineObject(rank); SetPosition(2, Math::Vector(-5.75f, 1.65f, 5.0f)); @@ -5556,7 +5556,7 @@ bool CObject::CreateApollo(Math::Vector pos, float angle, ObjectType type) m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(3, rank); SetObjectParent(3, 0); - pModFile->ReadModel("objects\\apolloj4.mod"); // wheel + pModFile->ReadModel("data/models/apolloj4.mod"); // wheel pModFile->CreateEngineObject(rank); SetPosition(3, Math::Vector(5.75f, 1.65f, -5.0f)); @@ -5564,7 +5564,7 @@ bool CObject::CreateApollo(Math::Vector pos, float angle, ObjectType type) m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(4, rank); SetObjectParent(4, 0); - pModFile->ReadModel("objects\\apolloj4.mod"); // wheel + pModFile->ReadModel("data/models/apolloj4.mod"); // wheel pModFile->CreateEngineObject(rank); SetPosition(4, Math::Vector(5.75f, 1.65f, 5.0f)); @@ -5573,7 +5573,7 @@ bool CObject::CreateApollo(Math::Vector pos, float angle, ObjectType type) m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(5, rank); SetObjectParent(5, 0); - pModFile->ReadModel("objects\\apolloj2.mod"); // antenna + pModFile->ReadModel("data/models/apolloj2.mod"); // antenna pModFile->CreateEngineObject(rank); SetPosition(5, Math::Vector(5.5f, 8.8f, 2.0f)); SetAngleY(5, -120.0f*Math::PI/180.0f); @@ -5583,7 +5583,7 @@ bool CObject::CreateApollo(Math::Vector pos, float angle, ObjectType type) m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(6, rank); SetObjectParent(6, 0); - pModFile->ReadModel("objects\\apolloj3.mod"); // camera + pModFile->ReadModel("data/models/apolloj3.mod"); // camera pModFile->CreateEngineObject(rank); SetPosition(6, Math::Vector(5.5f, 2.8f, -2.0f)); SetAngleY(6, 30.0f*Math::PI/180.0f); @@ -5602,7 +5602,7 @@ bool CObject::CreateApollo(Math::Vector pos, float angle, ObjectType type) rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); // it is a stationary object SetObjectRank(0, rank); - pModFile->ReadModel("objects\\apollof.mod"); + pModFile->ReadModel("data/models/apollof.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -5617,7 +5617,7 @@ bool CObject::CreateApollo(Math::Vector pos, float angle, ObjectType type) rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); // it is a stationary object SetObjectRank(0, rank); - pModFile->ReadModel("objects\\apollom.mod"); + pModFile->ReadModel("data/models/apollom.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -5634,7 +5634,7 @@ bool CObject::CreateApollo(Math::Vector pos, float angle, ObjectType type) rank = m_engine->CreateObject(); m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_FIX); // it is a stationary object SetObjectRank(0, rank); - pModFile->ReadModel("objects\\apolloa.mod"); + pModFile->ReadModel("data/models/apolloa.mod"); pModFile->CreateEngineObject(rank); SetPosition(0, pos); SetAngleY(0, angle); @@ -5644,7 +5644,7 @@ bool CObject::CreateApollo(Math::Vector pos, float angle, ObjectType type) m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); SetObjectRank(1, rank); SetObjectParent(1, 0); - pModFile->ReadModel("objects\\apolloj2.mod"); // antenna + pModFile->ReadModel("data/models/apolloj2.mod"); // antenna pModFile->CreateEngineObject(rank); SetPosition(1, Math::Vector(0.0f, 5.0f, 0.0f)); SetAngleY(1, -120.0f*Math::PI/180.0f); diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp index a40cc27..236c9a4 100644 --- a/src/ui/maindialog.cpp +++ b/src/ui/maindialog.cpp @@ -24,6 +24,7 @@ #include "common/profile.h" #include "common/iman.h" #include "common/restext.h" +#include "common/logger.h" #include "object/robotmain.h" #include "script/cmdtoken.h" #include "sound/sound.h" @@ -44,6 +45,7 @@ #include #include +// #include namespace Ui @@ -203,7 +205,7 @@ CMainDialog::CMainDialog(CInstanceManager* iMan) m_partiTime[i] = 0.0f; } - strcpy(m_sceneDir, "scene"); + strcpy(m_sceneDir, "data/levels"); strcpy(m_savegameDir, "savegame"); strcpy(m_publicDir, "program"); strcpy(m_userDir, "user"); @@ -3670,35 +3672,46 @@ void CMainDialog::ReadNameList() pl->Flush(); nbFilenames = 0; - /* TODO: list dir - sprintf(dir, "%s\\*", m_savegameDir); - hFile = _findfirst(dir, &fBuffer); - if ( hFile != -1 ) - { - do - { - if ( (fBuffer.attrib & _A_SUBDIR) && fBuffer.name[0] != '.' ) - { - strcpy(filenames[nbFilenames++], fBuffer.name); - } - } - while ( _findnext(hFile, &fBuffer) == 0 && nbFilenames < 100 ); - } - do // sorts all names: - { - bDo = false; - for ( i=0 ; i 0 ) - { - strcpy(temp, filenames[i]); - strcpy(filenames[i], filenames[i+1]); - strcpy(filenames[i+1], temp); - bDo = true; - } - } - } - while ( bDo );*/ + + sprintf(dir, ".\\%s", m_savegameDir); + + // if (! boost::filesystem::exists(dir)) + // { + // GetLogger()->Error("Savegame dir does not exist %s\n",dir); + // } + // else + // { + // GetLogger()->Info("Opening file"); + // } + //TODO list files + + // hFile = _findfirst(dir, &fBuffer); + // if ( hFile != -1 ) + // { + // do + // { + // if ( (fBuffer.attrib & _A_SUBDIR) && fBuffer.name[0] != '.' ) + // { + // strcpy(filenames[nbFilenames++], fBuffer.name); + // } + // } + // while ( _findnext(hFile, &fBuffer) == 0 && nbFilenames < 100 ); + // } + // do // sorts all names: + // { + // bDo = false; + // for ( i=0 ; i 0 ) + // { + // strcpy(temp, filenames[i]); + // strcpy(filenames[i], filenames[i+1]); + // strcpy(filenames[i+1], temp); + // bDo = true; + // } + // } + // } + // while ( bDo ); strcpy(filenames[nbFilenames++], "Test"); -- cgit v1.2.3-1-g7c22