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

Somehow missed some more Scraps :/

master
krzys-h 2015-08-13 19:53:03 +02:00
parent a644fc107d
commit c399e5e246
3 changed files with 3 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,12 +169,6 @@ bool CPyro::Create(PyroType type, CObject* obj, float force)
m_power = true;
m_posPower = m_pos;
}
if ( oType == OBJECT_SCRAP4 ||
oType == OBJECT_SCRAP5 ) // plastic material?
{
m_power = true;
m_posPower = m_pos;
}
// Plays the sound of a pyrotechnic effect.
if ( type == PT_FRAGT ||

5
src/object/object_type.h
View File

@ -66,11 +66,6 @@ enum ObjectType
OBJECT_BULLET = 36, //! < OrgaMatter
OBJECT_BBOX = 37, //! < BlackBox
OBJECT_TNT = 38, //! < TNT
OBJECT_SCRAP1 = 40, //! < Scrap1 (metal)
OBJECT_SCRAP2 = 41, //! < Scrap2 (metal)
OBJECT_SCRAP3 = 42, //! < Scrap3 (metal)
OBJECT_SCRAP4 = 43, //! < Scrap4 (plastic)
OBJECT_SCRAP5 = 44, //! < Scrap5 (plastic)
OBJECT_MARKPOWER = 50, //! < PowerSpot
OBJECT_MARKSTONE = 51, //! < TitaniumSpot
OBJECT_MARKURANIUM = 52, //! < UraniumSpot

40
src/object/task/taskgoto.cpp
View File

@ -1033,26 +1033,8 @@ bool CTaskGoto::AdjustTarget(CObject* pObj, Math::Vector &pos, float &distance)
type = pObj->GetType();
if ( type == OBJECT_FRET ||
type == OBJECT_STONE ||
type == OBJECT_URANIUM ||
type == OBJECT_METAL ||
type == OBJECT_POWER ||
type == OBJECT_ATOMIC ||
type == OBJECT_BULLET ||
type == OBJECT_BBOX ||
type == OBJECT_KEYa ||
type == OBJECT_KEYb ||
type == OBJECT_KEYc ||
type == OBJECT_KEYd ||
type == OBJECT_TNT ||
type == OBJECT_SCRAP1 ||
type == OBJECT_SCRAP2 ||
type == OBJECT_SCRAP3 ||
type == OBJECT_SCRAP4 ||
type == OBJECT_SCRAP5 ||
type == OBJECT_BOMB ||
type == OBJECT_RUINmobilew1 ||
if ( pObj->Implements(ObjectInterfaceType::Transportable) ||
type == OBJECT_RUINmobilew1 || // TODO: CRecoverableObject?
type == OBJECT_RUINmobilew2 ||
type == OBJECT_RUINmobilet1 ||
type == OBJECT_RUINmobilet2 ||
@ -1426,23 +1408,7 @@ void CTaskGoto::ComputeRepulse(Math::Point &dir)
if ( bAlien )
{
if ( oType == OBJECT_STONE ||
oType == OBJECT_URANIUM ||
oType == OBJECT_METAL ||
oType == OBJECT_POWER ||
oType == OBJECT_ATOMIC ||
oType == OBJECT_BULLET ||
oType == OBJECT_BBOX ||
oType == OBJECT_KEYa ||
oType == OBJECT_KEYb ||
oType == OBJECT_KEYc ||
oType == OBJECT_KEYd ||
oType == OBJECT_TNT ||
oType == OBJECT_SCRAP1 ||
oType == OBJECT_SCRAP2 ||
oType == OBJECT_SCRAP3 ||
oType == OBJECT_SCRAP4 ||
oType == OBJECT_SCRAP5 ||
if ( pObj->Implements(ObjectInterfaceType::Transportable) ||
oType == OBJECT_BOMB ||
(oType >= OBJECT_PLANT0 &&
oType <= OBJECT_PLANT19 ) ||