immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed paths for models and levels. Now it's possible to load level.

dev-ui
Zaba999 2012-09-20 22:58:00 +02:00
parent 57d33d79ea
commit 191fdc614e
14 changed files with 467 additions and 453 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CBot/CBot.cpp
View File

@ -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<CBotExprVar*>(inst))->m_nIdent = -2; // identificator for this

5
src/CBot/CBot.h
View File

@ -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 &);
};

2
src/CMakeLists.txt
View File

@ -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}
..
)

6
src/graphics/engine/engine.cpp
View File

@ -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);

42
src/object/motion/motionant.cpp
View File

@ -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));

46
src/object/motion/motionbee.cpp
View File

@ -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));

44
src/object/motion/motionhuman.cpp
View File

@ -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);

40
src/object/motion/motionmother.cpp
View File

@ -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));

12
src/object/motion/motionspider.cpp
View File

@ -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));

20
src/object/motion/motiontoto.cpp
View File

@ -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);

152
src/object/motion/motionvehicle.cpp
View File

@ -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);

8
src/object/motion/motionworm.cpp
View File

@ -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));

466
src/object/object.cpp
View File

File diff suppressed because it is too large Load Diff

73
src/ui/maindialog.cpp
View File

@ -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 <stdio.h>
#include <string.h>
// #include <boost/filesystem.hpp>
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<nbFilenames-1 ; i++ )
{
if ( strcmp(filenames[i], filenames[i+1]) > 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<nbFilenames-1 ; i++ )
// {
// if ( strcmp(filenames[i], filenames[i+1]) > 0 )
// {
// strcpy(temp, filenames[i]);
// strcpy(filenames[i], filenames[i+1]);
// strcpy(filenames[i+1], temp);
// bDo = true;
// }
// }
// }
// while ( bDo );
strcpy(filenames[nbFilenames++], "Test");