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

Removed some unused objects

dev-ui
krzys-h 2014-01-11 23:42:45 +01:00
parent d855586674
commit 652dc6081d
6 changed files with 16 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/object/object.h
View File

@ -121,10 +121,6 @@ enum ObjectType
OBJECT_TREE3 = 93, //! < Tree3
OBJECT_TREE4 = 94, //! < Tree4
OBJECT_TREE5 = 95, //! < Tree5
OBJECT_TREE6 = 96, //! < Tree6
OBJECT_TREE7 = 97, //! < Tree7
OBJECT_TREE8 = 98, //! < Tree8
OBJECT_TREE9 = 99, //! < Tree9
OBJECT_MOBILEwt = 100, //! < PracticeBot
OBJECT_MOBILEtt = 101, //! < track-trainer (unused)
OBJECT_MOBILEft = 102, //! < fly-trainer (unused)
@ -170,7 +166,6 @@ enum ObjectType
OBJECT_BARRIER1 = 401, //! < Barrier1
OBJECT_BARRIER2 = 402, //! < Barrier2
OBJECT_BARRIER3 = 403, //! < Barrier3
OBJECT_BARRIER4 = 404, //! < Barrier4
OBJECT_MOTHER = 500, //! < AlienQueen
OBJECT_EGG = 501, //! < AlienEgg
OBJECT_ANT = 502, //! < AlienAnt
@ -235,41 +230,18 @@ enum ObjectType
OBJECT_TEEN42 = 662, //! < Teen42
OBJECT_TEEN43 = 663, //! < Teen43
OBJECT_TEEN44 = 664, //! < Teen44
OBJECT_TEEN45 = 665, //! < Teen45
OBJECT_TEEN46 = 666, //! < Teen46
OBJECT_TEEN47 = 667, //! < Teen47
OBJECT_TEEN48 = 668, //! < Teen48
OBJECT_TEEN49 = 669, //! < Teen49
OBJECT_QUARTZ0 = 700, //! < Quartz0
OBJECT_QUARTZ1 = 701, //! < Quartz1
OBJECT_QUARTZ2 = 702, //! < Quartz2
OBJECT_QUARTZ3 = 703, //! < Quartz3
OBJECT_QUARTZ4 = 704, //! < Quartz4
OBJECT_QUARTZ5 = 705, //! < Quartz5
OBJECT_QUARTZ6 = 706, //! < Quartz6
OBJECT_QUARTZ7 = 707, //! < Quartz7
OBJECT_QUARTZ8 = 708, //! < Quartz8
OBJECT_QUARTZ9 = 709, //! < Quartz9
OBJECT_ROOT0 = 710, //! < MegaStalk0
OBJECT_ROOT1 = 711, //! < MegaStalk1
OBJECT_ROOT2 = 712, //! < MegaStalk2
OBJECT_ROOT3 = 713, //! < MegaStalk3
OBJECT_ROOT4 = 714, //! < MegaStalk4
OBJECT_ROOT5 = 715, //! < MegaStalk5
OBJECT_ROOT6 = 716, //! < MegaStalk6
OBJECT_ROOT7 = 717, //! < MegaStalk7
OBJECT_ROOT8 = 718, //! < MegaStalk8
OBJECT_ROOT9 = 719, //! < MegaStalk9
OBJECT_MUSHROOM0 = 730, //! < Mushroom0
OBJECT_MUSHROOM1 = 731, //! < Mushroom1
OBJECT_MUSHROOM2 = 732, //! < Mushroom2
OBJECT_MUSHROOM3 = 733, //! < Mushroom3
OBJECT_MUSHROOM4 = 734, //! < Mushroom4
OBJECT_MUSHROOM5 = 735, //! < Mushroom5
OBJECT_MUSHROOM6 = 736, //! < Mushroom6
OBJECT_MUSHROOM7 = 737, //! < Mushroom7
OBJECT_MUSHROOM8 = 738, //! < Mushroom8
OBJECT_MUSHROOM9 = 739, //! < Mushroom9
OBJECT_APOLLO1 = 900, //! < ApolloLEM
OBJECT_APOLLO2 = 901, //! < ApolloJeep
OBJECT_APOLLO3 = 902, //! < ApolloFlag

42
src/object/objman.cpp
View File

@ -160,8 +160,7 @@ CObject* CObjectManager::CreateObject(Math::Vector pos, float angle, ObjectType
if ( type == OBJECT_BARRIER0 ||
type == OBJECT_BARRIER1 ||
type == OBJECT_BARRIER2 ||
type == OBJECT_BARRIER3 ||
type == OBJECT_BARRIER4 )
type == OBJECT_BARRIER3 )
{
object = new CObject();
object->CreateBarrier(pos, angle, height, type);
@ -192,26 +191,14 @@ CObject* CObjectManager::CreateObject(Math::Vector pos, float angle, ObjectType
type == OBJECT_TREE2 ||
type == OBJECT_TREE3 ||
type == OBJECT_TREE4 ||
type == OBJECT_TREE5 ||
type == OBJECT_TREE6 ||
type == OBJECT_TREE7 ||
type == OBJECT_TREE8 ||
type == OBJECT_TREE9 )
type == OBJECT_TREE5 )
{
object = new CObject();
object->CreatePlant(pos, angle, height, type);
}
else
if ( type == OBJECT_MUSHROOM0 ||
type == OBJECT_MUSHROOM1 ||
type == OBJECT_MUSHROOM2 ||
type == OBJECT_MUSHROOM3 ||
type == OBJECT_MUSHROOM4 ||
type == OBJECT_MUSHROOM5 ||
type == OBJECT_MUSHROOM6 ||
type == OBJECT_MUSHROOM7 ||
type == OBJECT_MUSHROOM8 ||
type == OBJECT_MUSHROOM9 )
if ( type == OBJECT_MUSHROOM1 ||
type == OBJECT_MUSHROOM2 )
{
object = new CObject();
object->CreateMushroom(pos, angle, height, type);
@ -261,12 +248,7 @@ CObject* CObjectManager::CreateObject(Math::Vector pos, float angle, ObjectType
type == OBJECT_TEEN41 ||
type == OBJECT_TEEN42 ||
type == OBJECT_TEEN43 ||
type == OBJECT_TEEN44 ||
type == OBJECT_TEEN45 ||
type == OBJECT_TEEN46 ||
type == OBJECT_TEEN47 ||
type == OBJECT_TEEN48 ||
type == OBJECT_TEEN49 )
type == OBJECT_TEEN44 )
{
object = new CObject();
object->SetOption(option);
@ -276,13 +258,7 @@ CObject* CObjectManager::CreateObject(Math::Vector pos, float angle, ObjectType
if ( type == OBJECT_QUARTZ0 ||
type == OBJECT_QUARTZ1 ||
type == OBJECT_QUARTZ2 ||
type == OBJECT_QUARTZ3 ||
type == OBJECT_QUARTZ4 ||
type == OBJECT_QUARTZ5 ||
type == OBJECT_QUARTZ6 ||
type == OBJECT_QUARTZ7 ||
type == OBJECT_QUARTZ8 ||
type == OBJECT_QUARTZ9 )
type == OBJECT_QUARTZ3 )
{
object = new CObject();
object->CreateQuartz(pos, angle, height, type);
@ -293,11 +269,7 @@ CObject* CObjectManager::CreateObject(Math::Vector pos, float angle, ObjectType
type == OBJECT_ROOT2 ||
type == OBJECT_ROOT3 ||
type == OBJECT_ROOT4 ||
type == OBJECT_ROOT5 ||
type == OBJECT_ROOT6 ||
type == OBJECT_ROOT7 ||
type == OBJECT_ROOT8 ||
type == OBJECT_ROOT9 )
type == OBJECT_ROOT5 )
{
object = new CObject();
object->CreateRoot(pos, angle, height, type);

6
src/object/robotmain.cpp
View File

@ -4592,11 +4592,11 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
(type >= OBJECT_PLANT0 &&
type <= OBJECT_PLANT19 ) ||
(type >= OBJECT_TREE0 &&
type <= OBJECT_TREE9 ) ||
type <= OBJECT_TREE5 ) ||
(type >= OBJECT_TEEN0 &&
type <= OBJECT_TEEN49 ) ||
type <= OBJECT_TEEN44 ) ||
(type >= OBJECT_QUARTZ0 &&
type <= OBJECT_QUARTZ9 ) ||
type <= OBJECT_QUARTZ3 ) ||
(type >= OBJECT_ROOT0 &&
type <= OBJECT_ROOT4 ) ) // not ROOT5!
{

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

@ -1559,8 +1559,8 @@ void CTaskGoto::ComputeRepulse(Math::Point &dir)
oType == OBJECT_BOMB ||
(oType >= OBJECT_PLANT0 &&
oType <= OBJECT_PLANT19 ) ||
(oType >= OBJECT_MUSHROOM0 &&
oType <= OBJECT_MUSHROOM9 ) ) continue;
(oType >= OBJECT_MUSHROOM1 &&
oType <= OBJECT_MUSHROOM2 ) ) continue;
}
addi = add;

8
src/physics/physics.cpp
View File

@ -2565,19 +2565,19 @@ int CPhysics::ObjectAdapt(const Math::Vector &pos, const Math::Vector &angle)
oType == OBJECT_KEYd ||
oType == OBJECT_TNT ||
(oType >= OBJECT_PLANT0 && oType <= OBJECT_PLANT19 ) ||
(oType >= OBJECT_MUSHROOM0 && oType <= OBJECT_MUSHROOM9) ) continue;
(oType >= OBJECT_MUSHROOM1 && oType <= OBJECT_MUSHROOM2) ) continue;
}
#if _TEEN
/* TODO: #if _TEEN
if ( oType == OBJECT_WAYPOINT &&
pObj->GetEnable() &&
!m_object->GetResetBusy() ) // driving vehicle?
#else
#else */
if ( oType == OBJECT_WAYPOINT &&
pObj->GetEnable() &&
!m_object->GetResetBusy() &&
m_object->GetTrainer() ) // driving vehicle?
#endif
/* #endif */
{
oPos = pObj->GetPosition(0);
distance = Math::DistanceProjected(oPos, iPos);

72
src/script/cmdtoken.cpp
View File

@ -271,20 +271,8 @@ ObjectType GetTypeObject(char *line, int rank, ObjectType def)
if ( Cmd(p, "Tree3" ) ) return OBJECT_TREE3;
if ( Cmd(p, "Tree4" ) ) return OBJECT_TREE4;
if ( Cmd(p, "Tree5" ) ) return OBJECT_TREE5;
if ( Cmd(p, "Tree6" ) ) return OBJECT_TREE6;
if ( Cmd(p, "Tree7" ) ) return OBJECT_TREE7;
if ( Cmd(p, "Tree8" ) ) return OBJECT_TREE8;
if ( Cmd(p, "Tree9" ) ) return OBJECT_TREE9;
if ( Cmd(p, "Mushroom0" ) ) return OBJECT_MUSHROOM0;
if ( Cmd(p, "Mushroom1" ) ) return OBJECT_MUSHROOM1;
if ( Cmd(p, "Mushroom2" ) ) return OBJECT_MUSHROOM2;
if ( Cmd(p, "Mushroom3" ) ) return OBJECT_MUSHROOM3;
if ( Cmd(p, "Mushroom4" ) ) return OBJECT_MUSHROOM4;
if ( Cmd(p, "Mushroom5" ) ) return OBJECT_MUSHROOM5;
if ( Cmd(p, "Mushroom6" ) ) return OBJECT_MUSHROOM6;
if ( Cmd(p, "Mushroom7" ) ) return OBJECT_MUSHROOM7;
if ( Cmd(p, "Mushroom8" ) ) return OBJECT_MUSHROOM8;
if ( Cmd(p, "Mushroom9" ) ) return OBJECT_MUSHROOM9;
if ( Cmd(p, "Home" ) ) return OBJECT_HOME1;
if ( Cmd(p, "Derrick" ) ) return OBJECT_DERRICK;
if ( Cmd(p, "BotFactory" ) ) return OBJECT_FACTORY;
@ -330,7 +318,6 @@ ObjectType GetTypeObject(char *line, int rank, ObjectType def)
if ( Cmd(p, "Barrier1" ) ) return OBJECT_BARRIER1;
if ( Cmd(p, "Barrier2" ) ) return OBJECT_BARRIER2;
if ( Cmd(p, "Barrier3" ) ) return OBJECT_BARRIER3;
if ( Cmd(p, "Barrier4" ) ) return OBJECT_BARRIER4;
if ( Cmd(p, "Teen0" ) ) return OBJECT_TEEN0;
if ( Cmd(p, "Teen1" ) ) return OBJECT_TEEN1;
if ( Cmd(p, "Teen2" ) ) return OBJECT_TEEN2;
@ -376,31 +363,16 @@ ObjectType GetTypeObject(char *line, int rank, ObjectType def)
if ( Cmd(p, "Teen42" ) ) return OBJECT_TEEN42;
if ( Cmd(p, "Teen43" ) ) return OBJECT_TEEN43;
if ( Cmd(p, "Teen44" ) ) return OBJECT_TEEN44;
if ( Cmd(p, "Teen45" ) ) return OBJECT_TEEN45;
if ( Cmd(p, "Teen46" ) ) return OBJECT_TEEN46;
if ( Cmd(p, "Teen47" ) ) return OBJECT_TEEN47;
if ( Cmd(p, "Teen48" ) ) return OBJECT_TEEN48;
if ( Cmd(p, "Teen49" ) ) return OBJECT_TEEN49;
if ( Cmd(p, "Quartz0" ) ) return OBJECT_QUARTZ0;
if ( Cmd(p, "Quartz1" ) ) return OBJECT_QUARTZ1;
if ( Cmd(p, "Quartz2" ) ) return OBJECT_QUARTZ2;
if ( Cmd(p, "Quartz3" ) ) return OBJECT_QUARTZ3;
if ( Cmd(p, "Quartz4" ) ) return OBJECT_QUARTZ4;
if ( Cmd(p, "Quartz5" ) ) return OBJECT_QUARTZ5;
if ( Cmd(p, "Quartz6" ) ) return OBJECT_QUARTZ6;
if ( Cmd(p, "Quartz7" ) ) return OBJECT_QUARTZ7;
if ( Cmd(p, "Quartz8" ) ) return OBJECT_QUARTZ8;
if ( Cmd(p, "Quartz9" ) ) return OBJECT_QUARTZ9;
if ( Cmd(p, "MegaStalk0" ) ) return OBJECT_ROOT0;
if ( Cmd(p, "MegaStalk1" ) ) return OBJECT_ROOT1;
if ( Cmd(p, "MegaStalk2" ) ) return OBJECT_ROOT2;
if ( Cmd(p, "MegaStalk3" ) ) return OBJECT_ROOT3;
if ( Cmd(p, "MegaStalk4" ) ) return OBJECT_ROOT4;
if ( Cmd(p, "MegaStalk5" ) ) return OBJECT_ROOT5;
if ( Cmd(p, "MegaStalk6" ) ) return OBJECT_ROOT6;
if ( Cmd(p, "MegaStalk7" ) ) return OBJECT_ROOT7;
if ( Cmd(p, "MegaStalk8" ) ) return OBJECT_ROOT8;
if ( Cmd(p, "MegaStalk9" ) ) return OBJECT_ROOT9;
if ( Cmd(p, "ApolloLEM" ) ) return OBJECT_APOLLO1;
if ( Cmd(p, "ApolloJeep" ) ) return OBJECT_APOLLO2;
if ( Cmd(p, "ApolloFlag" ) ) return OBJECT_APOLLO3;
@ -445,11 +417,7 @@ const char* GetTypeObject(ObjectType type)
if ( type == OBJECT_MOBILEdr ) return "Scribbler";
if ( type == OBJECT_MARKPOWER ) return "PowerSpot";
if ( type == OBJECT_MARKSTONE ) return "TitaniumSpot";
#if _GERMAN | _WG
if ( type == OBJECT_MARKURANIUM ) return "PlatinumSpot";
#else
if ( type == OBJECT_MARKURANIUM ) return "UraniumSpot";
#endif
if ( type == OBJECT_MARKKEYa ) return "KeyASpot";
if ( type == OBJECT_MARKKEYb ) return "KeyBSpot";
if ( type == OBJECT_MARKKEYc ) return "KeyCSpot";
@ -461,17 +429,9 @@ const char* GetTypeObject(ObjectType type)
if ( type == OBJECT_FLAGy ) return "YellowFlag";
if ( type == OBJECT_FLAGv ) return "VioletFlag";
if ( type == OBJECT_POWER ) return "PowerCell";
#if _GERMAN | _WG
if ( type == OBJECT_ATOMIC ) return "FuelCell";
#else
if ( type == OBJECT_ATOMIC ) return "NuclearCell";
#endif
if ( type == OBJECT_STONE ) return "TitaniumOre";
#if _GERMAN | _WG
if ( type == OBJECT_URANIUM ) return "PlatinumOre";
#else
if ( type == OBJECT_URANIUM ) return "UraniumOre";
#endif
if ( type == OBJECT_METAL ) return "Titanium";
if ( type == OBJECT_BULLET ) return "OrgaMatter";
if ( type == OBJECT_BBOX ) return "BlackBox";
@ -514,20 +474,8 @@ const char* GetTypeObject(ObjectType type)
if ( type == OBJECT_TREE3 ) return "Tree3";
if ( type == OBJECT_TREE4 ) return "Tree4";
if ( type == OBJECT_TREE5 ) return "Tree5";
if ( type == OBJECT_TREE6 ) return "Tree6";
if ( type == OBJECT_TREE7 ) return "Tree7";
if ( type == OBJECT_TREE8 ) return "Tree8";
if ( type == OBJECT_TREE9 ) return "Tree9";
if ( type == OBJECT_MUSHROOM0 ) return "Mushroom0";
if ( type == OBJECT_MUSHROOM1 ) return "Mushroom1";
if ( type == OBJECT_MUSHROOM2 ) return "Mushroom2";
if ( type == OBJECT_MUSHROOM3 ) return "Mushroom3";
if ( type == OBJECT_MUSHROOM4 ) return "Mushroom4";
if ( type == OBJECT_MUSHROOM5 ) return "Mushroom5";
if ( type == OBJECT_MUSHROOM6 ) return "Mushroom6";
if ( type == OBJECT_MUSHROOM7 ) return "Mushroom7";
if ( type == OBJECT_MUSHROOM8 ) return "Mushroom8";
if ( type == OBJECT_MUSHROOM9 ) return "Mushroom9";
if ( type == OBJECT_HOME1 ) return "Home";
if ( type == OBJECT_DERRICK ) return "Derrick";
if ( type == OBJECT_FACTORY ) return "BotFactory";
@ -542,11 +490,7 @@ const char* GetTypeObject(ObjectType type)
if ( type == OBJECT_INFO ) return "ExchangePost";
if ( type == OBJECT_ENERGY ) return "PowerPlant";
if ( type == OBJECT_LABO ) return "AutoLab";
/* TODO: #if _GERMAN | _WG
if ( type == OBJECT_NUCLEAR ) return "FuelCellPlant";
#else */
if ( type == OBJECT_NUCLEAR ) return "NuclearPlant";
/* #endif */
if ( type == OBJECT_PARA ) return "PowerCaptor";
if ( type == OBJECT_SAFE ) return "Vault";
if ( type == OBJECT_HUSTON ) return "Houston";
@ -577,7 +521,6 @@ const char* GetTypeObject(ObjectType type)
if ( type == OBJECT_BARRIER1 ) return "Barrier1";
if ( type == OBJECT_BARRIER2 ) return "Barrier2";
if ( type == OBJECT_BARRIER3 ) return "Barrier3";
if ( type == OBJECT_BARRIER4 ) return "Barrier4";
if ( type == OBJECT_TEEN0 ) return "Teen0";
if ( type == OBJECT_TEEN1 ) return "Teen1";
if ( type == OBJECT_TEEN2 ) return "Teen2";
@ -623,31 +566,16 @@ const char* GetTypeObject(ObjectType type)
if ( type == OBJECT_TEEN42 ) return "Teen42";
if ( type == OBJECT_TEEN43 ) return "Teen43";
if ( type == OBJECT_TEEN44 ) return "Teen44";
if ( type == OBJECT_TEEN45 ) return "Teen45";
if ( type == OBJECT_TEEN46 ) return "Teen46";
if ( type == OBJECT_TEEN47 ) return "Teen47";
if ( type == OBJECT_TEEN48 ) return "Teen48";
if ( type == OBJECT_TEEN49 ) return "Teen49";
if ( type == OBJECT_QUARTZ0 ) return "Quartz0";
if ( type == OBJECT_QUARTZ1 ) return "Quartz1";
if ( type == OBJECT_QUARTZ2 ) return "Quartz2";
if ( type == OBJECT_QUARTZ3 ) return "Quartz3";
if ( type == OBJECT_QUARTZ4 ) return "Quartz4";
if ( type == OBJECT_QUARTZ5 ) return "Quartz5";
if ( type == OBJECT_QUARTZ6 ) return "Quartz6";
if ( type == OBJECT_QUARTZ7 ) return "Quartz7";
if ( type == OBJECT_QUARTZ8 ) return "Quartz8";
if ( type == OBJECT_QUARTZ9 ) return "Quartz9";
if ( type == OBJECT_ROOT0 ) return "MegaStalk0";
if ( type == OBJECT_ROOT1 ) return "MegaStalk1";
if ( type == OBJECT_ROOT2 ) return "MegaStalk2";
if ( type == OBJECT_ROOT3 ) return "MegaStalk3";
if ( type == OBJECT_ROOT4 ) return "MegaStalk4";
if ( type == OBJECT_ROOT5 ) return "MegaStalk5";
if ( type == OBJECT_ROOT6 ) return "MegaStalk6";
if ( type == OBJECT_ROOT7 ) return "MegaStalk7";
if ( type == OBJECT_ROOT8 ) return "MegaStalk8";
if ( type == OBJECT_ROOT9 ) return "MegaStalk9";
if ( type == OBJECT_APOLLO1 ) return "ApolloLEM";
if ( type == OBJECT_APOLLO2 ) return "ApolloJeep";
if ( type == OBJECT_APOLLO3 ) return "ApolloFlag";