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

Fixed problem with test compilation 

Altered test cmake files to fix linker problem.
Changed tga to png in pyro.
Changed enum in CMotionDummy.
dev-ui
erihel 2013-04-29 14:29:12 +02:00
parent 64162a0e6f
commit 2ba146cd63
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/graphics/engine/pyro.cpp
View File

@ -1555,7 +1555,7 @@ void CPyro::ExploStart()
{ {
int objRank = m_object->GetObjectRank(i); int objRank = m_object->GetObjectRank(i);
if ( objRank == -1 ) continue; if ( objRank == -1 ) continue;
m_engine->ChangeSecondTexture(objRank, "dirty04.tga"); m_engine->ChangeSecondTexture(objRank, "dirty04.png");
Math::Vector pos = m_object->GetPosition(i); Math::Vector pos = m_object->GetPosition(i);

5
src/object/motion/motiondummy.cpp
View File

@ -1,5 +1,6 @@
// * This file is part of the COLOBOT source code // * This file is part of the COLOBOT source code
// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch // * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch
// * Copyright (C) 2013 Polish Portal of Colobot (PPC)
// * // *
// * This program is free software: you can redistribute it and/or modify // * This program is free software: you can redistribute it and/or modify
// * it under the terms of the GNU General Public License as published by // * it under the terms of the GNU General Public License as published by
@ -55,8 +56,8 @@ bool CMotionDummy::Create(Math::Vector pos, float angle, ObjectType type,
// Creates the main base. // Creates the main base.
int rank = m_engine->CreateObject(); int rank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_VEHICULE); // this is a moving object m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_VEHICLE); // this is a moving object
m_object->SetObjectRank(0, rank); m_object->SetObjectRank(0, rank);
return true; return true;
} }

3
src/object/motion/motiondummy.h
View File

@ -1,5 +1,6 @@
// * This file is part of the COLOBOT source code // * This file is part of the COLOBOT source code
// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch // * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch
// * Copyright (C) 2013 Polish Portal of Colobot (PPC)
// * // *
// * This program is free software: you can redistribute it and/or modify // * This program is free software: you can redistribute it and/or modify
// * it under the terms of the GNU General Public License as published by // * it under the terms of the GNU General Public License as published by
@ -29,4 +30,4 @@ public:
void DeleteObject(bool bAll=false); void DeleteObject(bool bAll=false);
bool Create(Math::Vector pos, float angle, ObjectType type, float power); bool Create(Math::Vector pos, float angle, ObjectType type, float power);
}; };

1
test/unit/CMakeLists.txt
View File

@ -89,6 +89,7 @@ ${SRC_DIR}/object/motion/motionspider.cpp
${SRC_DIR}/object/motion/motiontoto.cpp ${SRC_DIR}/object/motion/motiontoto.cpp
${SRC_DIR}/object/motion/motionvehicle.cpp ${SRC_DIR}/object/motion/motionvehicle.cpp
${SRC_DIR}/object/motion/motionworm.cpp ${SRC_DIR}/object/motion/motionworm.cpp
${SRC_DIR}/object/motion/motiondummy.cpp
${SRC_DIR}/object/object.cpp ${SRC_DIR}/object/object.cpp
${SRC_DIR}/object/objman.cpp ${SRC_DIR}/object/objman.cpp
${SRC_DIR}/object/robotmain.cpp ${SRC_DIR}/object/robotmain.cpp