diff options
author | krzys-h <krzys_h@interia.pl> | 2014-01-11 23:42:45 +0100 |
---|---|---|
committer | krzys-h <krzys_h@interia.pl> | 2014-01-11 23:43:10 +0100 |
commit | 652dc6081df8dc73bc9f57c031420e498be71451 (patch) | |
tree | 9dc9482232eedfc0040c6ada6c202b19af34a9d7 /src/object | |
parent | d8555866747d8624debf52620605d90890e98c15 (diff) | |
download | colobot-652dc6081df8dc73bc9f57c031420e498be71451.tar.gz colobot-652dc6081df8dc73bc9f57c031420e498be71451.tar.bz2 colobot-652dc6081df8dc73bc9f57c031420e498be71451.zip |
Removed some unused objects
Diffstat (limited to 'src/object')
-rw-r--r-- | src/object/object.h | 28 | ||||
-rw-r--r-- | src/object/objman.cpp | 42 | ||||
-rw-r--r-- | src/object/robotmain.cpp | 6 | ||||
-rw-r--r-- | src/object/task/taskgoto.cpp | 4 |
4 files changed, 12 insertions, 68 deletions
diff --git a/src/object/object.h b/src/object/object.h index d5a073c..5d9e681 100644 --- a/src/object/object.h +++ b/src/object/object.h @@ -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 diff --git a/src/object/objman.cpp b/src/object/objman.cpp index 131d007..b0bac1a 100644 --- a/src/object/objman.cpp +++ b/src/object/objman.cpp @@ -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); diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index 0d95907..ced1127 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -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! { diff --git a/src/object/task/taskgoto.cpp b/src/object/task/taskgoto.cpp index 01ff38b..8070d13 100644 --- a/src/object/task/taskgoto.cpp +++ b/src/object/task/taskgoto.cpp @@ -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; |