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

Make Thumper Squash transportable/small objects.

1008-fix
DavivaD 2017-07-21 20:36:31 +02:00
parent 75d9f8573b
commit bef6e9eceb
1 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/object/task/taskterraform.cpp
View File

@ -363,12 +363,47 @@ bool CTaskTerraform::Terraform()
type = pObj->GetType(); type = pObj->GetType();
if ( type == OBJECT_NULL ) continue; 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()); dist = Math::Distance(m_terraPos, pObj->GetPosition());
if ( dist > 20.0f ) continue; 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 else
{ {