diff options
author | erihel <erihel@gmail.com> | 2013-04-29 14:29:12 +0200 |
---|---|---|
committer | erihel <erihel@gmail.com> | 2013-04-29 14:29:12 +0200 |
commit | 2ba146cd63cefd58f5ff464b5b94e43740cf0700 (patch) | |
tree | 80edae03c2b769b5c6e79e7f43b9ad34d804c87e /src/object | |
parent | 64162a0e6ffd799caddac98b8daa6fa4f31b7d64 (diff) | |
download | colobot-2ba146cd63cefd58f5ff464b5b94e43740cf0700.tar.gz colobot-2ba146cd63cefd58f5ff464b5b94e43740cf0700.tar.bz2 colobot-2ba146cd63cefd58f5ff464b5b94e43740cf0700.zip |
Fixed problem with test compilation
Altered test cmake files to fix linker problem.
Changed tga to png in pyro.
Changed enum in CMotionDummy.
Diffstat (limited to 'src/object')
-rw-r--r-- | src/object/motion/motiondummy.cpp | 5 | ||||
-rw-r--r-- | src/object/motion/motiondummy.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/object/motion/motiondummy.cpp b/src/object/motion/motiondummy.cpp index 68827ff..577ff47 100644 --- a/src/object/motion/motiondummy.cpp +++ b/src/object/motion/motiondummy.cpp @@ -1,5 +1,6 @@ // * This file is part of the COLOBOT source code // * 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 // * 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. 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); return true; -}
\ No newline at end of file +} diff --git a/src/object/motion/motiondummy.h b/src/object/motion/motiondummy.h index 744df2f..de29148 100644 --- a/src/object/motion/motiondummy.h +++ b/src/object/motion/motiondummy.h @@ -1,5 +1,6 @@ // * This file is part of the COLOBOT source code // * 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 // * it under the terms of the GNU General Public License as published by @@ -29,4 +30,4 @@ public: void DeleteObject(bool bAll=false); bool Create(Math::Vector pos, float angle, ObjectType type, float power); -};
\ No newline at end of file +}; |