This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch debian/master
in repository colobot.
commit bef6e9ecebe723e40ef67fb5b3ad41e5b2d92c3e
Author: DavivaD <davivad...@gmail.com>
Date: Fri Jul 21 20:36:31 2017 +0200
Make Thumper Squash transportable/small objects.
---
src/object/task/taskterraform.cpp | 41 ++++++++++++++++++++++++++++++++++++---
1 file changed, 38 insertions(+), 3 deletions(-)
diff --git a/src/object/task/taskterraform.cpp
b/src/object/task/taskterraform.cpp
index f71b985..06dc72c 100644
--- a/src/object/task/taskterraform.cpp
+++ b/src/object/task/taskterraform.cpp
@@ -363,12 +363,47 @@ bool CTaskTerraform::Terraform()
type = pObj->GetType();
if ( type == OBJECT_NULL ) continue;
- if ( type == OBJECT_TEEN34 ) // stone?
+ if ( type == OBJECT_TEEN34 ||
+ type == OBJECT_POWER ||
+ type == OBJECT_ATOMIC ||
+ type == OBJECT_STONE ||
+ type == OBJECT_URANIUM ||
+ type == OBJECT_METAL ||
+ type == OBJECT_BULLET ||
+ type == OBJECT_BBOX ||
+ type == OBJECT_KEYa ||
+ type == OBJECT_KEYb ||
+ type == OBJECT_KEYc ||
+ type == OBJECT_KEYd ||
+ type == OBJECT_TNT ||
+ type == OBJECT_NEST ||
+ type == OBJECT_BOMB ||
+ type == OBJECT_RUINmobilew1 ||
+ type == OBJECT_RUINmobilew2 ||
+ type == OBJECT_RUINmobilet1 ||
+ type == OBJECT_RUINmobilet2 ||
+ type == OBJECT_RUINdoor ||
+ type == OBJECT_RUINsupport ||
+ type == OBJECT_RUINradar ) // small/transportable objects?
{
dist = Math::Distance(m_terraPos, pObj->GetPosition());
if ( dist > 20.0f ) continue;
-
- m_engine->GetPyroManager()->Create(Gfx::PT_FRAGT, pObj);
+
+ if (type == OBJECT_BULLET ||
+ type == OBJECT_NEST )
+ {
+ m_engine->GetPyroManager()->Create(Gfx::PT_FRAGO, pObj);
+ }
+ else if (type == OBJECT_TNT ||
+ type == OBJECT_BOMB)
+ {
+ m_engine->GetPyroManager()->Create(Gfx::PT_EXPLOT, pObj);
+
dynamic_cast<CDamageableObject*>(m_object)->DamageObject(DamageType::Explosive,
0.9f);
+ }
+ else
+ {
+ m_engine->GetPyroManager()->Create(Gfx::PT_FRAGT, pObj);
+ }
}
else
{
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/colobot.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
