Changeset 9715 in orxonox.OLD for branches/new_class_id/src/world_entities/npcs

Timestamp:

Sep 1, 2006, 8:06:39 PM (18 years ago)

Author:

bensch

Message:

renamed newclassid to classid and newobjectlist to objectlist

Location:

branches/new_class_id/src/world_entities/npcs

Files:

• attractor_mine.cc (modified) (1 diff)
• attractor_mine.h (modified) (1 diff)
• door.cc (modified) (3 diffs)
• door.h (modified) (1 diff)
• gate.cc (modified) (3 diffs)
• gate.h (modified) (1 diff)
• generic_npc.cc (modified) (1 diff)
• generic_npc.h (modified) (1 diff)
• ground_turret.cc (modified) (1 diff)
• ground_turret.h (modified) (1 diff)
• network_turret.cc (modified) (1 diff)
• network_turret.h (modified) (1 diff)
• npc.cc (modified) (1 diff)
• npc.h (modified) (1 diff)
• npc_test.cc (modified) (1 diff)
• npc_test.h (modified) (1 diff)
• npc_test1.cc (modified) (1 diff)
• npc_test1.h (modified) (1 diff)
• repair_station.cc (modified) (1 diff)
• repair_station.h (modified) (1 diff)
• space_turret.cc (modified) (1 diff)
• space_turret.h (modified) (1 diff)

branches/new_class_id/src/world_entities/npcs/attractor_mine.cc

@@ -34 +34 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(AttractorMine, CL_ATTRACTOR_MINE);
+ObjectListDefinitionID(AttractorMine, CL_ATTRACTOR_MINE);
 CREATE_FACTORY(AttractorMine);
 #include "script_class.h"

branches/new_class_id/src/world_entities/npcs/attractor_mine.h

@@ -9 +9 @@
 
 class AttractorMine : public NPC {
-  NewObjectListDeclaration(AttractorMine);
+  ObjectListDeclaration(AttractorMine);
 
  public:

branches/new_class_id/src/world_entities/npcs/door.cc

@@ -27 +27 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Door, CL_DOOR);
+ObjectListDefinitionID(Door, CL_DOOR);
 CREATE_FACTORY(Door);
 
@@ -159 +159 @@
   float distance;
 
-  for (NewObjectList<Playable>::const_iterator it = Playable::objectList().begin();
+  for (ObjectList<Playable>::const_iterator it = Playable::objectList().begin();
        it != Playable::objectList().end();
        ++it)
@@ -173 +173 @@
 
 
-  for (NewObjectList<GenericNPC>::const_iterator it = GenericNPC::objectList().begin();
+  for (ObjectList<GenericNPC>::const_iterator it = GenericNPC::objectList().begin();
        it != GenericNPC::objectList().end();
        ++it)

branches/new_class_id/src/world_entities/npcs/door.h

@@ -21 +21 @@
 class Door : public WorldEntity
 {
-  NewObjectListDeclaration(Door);
+  ObjectListDeclaration(Door);
 
   public:

branches/new_class_id/src/world_entities/npcs/gate.cc

@@ -32 +32 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Gate, CL_GATE);
+ObjectListDefinitionID(Gate, CL_GATE);
 CREATE_FACTORY(Gate);
 
@@ -200 +200 @@
 
   // for all players
-  for (NewObjectList<Playable>::const_iterator it = Playable::objectList().begin();
+  for (ObjectList<Playable>::const_iterator it = Playable::objectList().begin();
        it != Playable::objectList().end();
        ++it)
@@ -212 +212 @@
 
 
-  for (NewObjectList<GenericNPC>::const_iterator it = GenericNPC::objectList().begin();
+  for (ObjectList<GenericNPC>::const_iterator it = GenericNPC::objectList().begin();
        it != GenericNPC::objectList().end();
        ++it)

branches/new_class_id/src/world_entities/npcs/gate.h

@@ -22 +22 @@
 class Gate : public WorldEntity
 {
-  NewObjectListDeclaration(Gate);
+  ObjectListDeclaration(Gate);
 
   public:

branches/new_class_id/src/world_entities/npcs/generic_npc.cc

@@ -33 +33 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(GenericNPC, CL_GENERIC_NPC);
+ObjectListDefinitionID(GenericNPC, CL_GENERIC_NPC);
 CREATE_FACTORY(GenericNPC);
 

branches/new_class_id/src/world_entities/npcs/generic_npc.h

@@ -25 +25 @@
 class GenericNPC : public NPC
 {
-  NewObjectListDeclaration(GenericNPC);
+  ObjectListDeclaration(GenericNPC);
 
 

branches/new_class_id/src/world_entities/npcs/ground_turret.cc

@@ -31 +31 @@
 #include "class_id.h"
 
-NewObjectListDefinitionID(GroundTurret, CL_GROUND_TURRET);
+ObjectListDefinitionID(GroundTurret, CL_GROUND_TURRET);
 CREATE_FACTORY(GroundTurret);
 

branches/new_class_id/src/world_entities/npcs/ground_turret.h

@@ -14 +14 @@
 class GroundTurret : public NPC
 {
-  NewObjectListDeclaration(GroundTurret);
+  ObjectListDeclaration(GroundTurret);
 
 public:

branches/new_class_id/src/world_entities/npcs/network_turret.cc

@@ -32 +32 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(NetworkTurret, CL_NETWORK_TURRET);
+ObjectListDefinitionID(NetworkTurret, CL_NETWORK_TURRET);
 CREATE_FACTORY(NetworkTurret);
 

branches/new_class_id/src/world_entities/npcs/network_turret.h

@@ -14 +14 @@
 class NetworkTurret : public NPC
 {
-  NewObjectListDeclaration(NetworkTurret);
+  ObjectListDeclaration(NetworkTurret);
 public:
   NetworkTurret(const TiXmlElement* root = NULL);

branches/new_class_id/src/world_entities/npcs/npc.cc

@@ -20 +20 @@
 #include "npc.h"
 
-NewObjectListDefinition(NPC);
+ObjectListDefinition(NPC);
 
 NPC::NPC(const TiXmlElement* root)

branches/new_class_id/src/world_entities/npcs/npc.h

@@ -8 +8 @@
 
 class NPC : public WorldEntity {
-  NewObjectListDeclaration(NPC);
+  ObjectListDeclaration(NPC);
  public:
    NPC (const TiXmlElement* root);

branches/new_class_id/src/world_entities/npcs/npc_test.cc

@@ -31 +31 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(NPC2, CL_NPC_TEST2);
+ObjectListDefinitionID(NPC2, CL_NPC_TEST2);
 CREATE_FACTORY(NPC2);
 

branches/new_class_id/src/world_entities/npcs/npc_test.h

@@ -9 +9 @@
 
 class NPC2 : public NPC {
-  NewObjectListDeclaration(NPC2);
+  ObjectListDeclaration(NPC2);
 
  public:

branches/new_class_id/src/world_entities/npcs/npc_test1.cc

@@ -25 +25 @@
 #include "power_ups/laser_power_up.h"
 
-NewObjectListDefinition(NPCTest1);
+ObjectListDefinition(NPCTest1);
 
 NPCTest1::NPCTest1()

branches/new_class_id/src/world_entities/npcs/npc_test1.h

@@ -8 +8 @@
 
 class NPCTest1 : public NPC {
-  NewObjectListDeclaration(NPCTest1);
+  ObjectListDeclaration(NPCTest1);
  public:
   NPCTest1 ();

branches/new_class_id/src/world_entities/npcs/repair_station.cc

@@ -27 +27 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(RepairStation, CL_DOOR +1 );
+ObjectListDefinitionID(RepairStation, CL_DOOR +1 );
 CREATE_FACTORY(RepairStation);
 

branches/new_class_id/src/world_entities/npcs/repair_station.h

@@ -27 +27 @@
 class RepairStation : public WorldEntity
 {
-  NewObjectListDeclaration(RepairStation);
+  ObjectListDeclaration(RepairStation);
   public:
     RepairStation ();

branches/new_class_id/src/world_entities/npcs/space_turret.cc

@@ -30 +30 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(SpaceTurret, CL_SPACE_TURRET);
+ObjectListDefinitionID(SpaceTurret, CL_SPACE_TURRET);
 CREATE_FACTORY(SpaceTurret);
 

branches/new_class_id/src/world_entities/npcs/space_turret.h

@@ -18 +18 @@
 class SpaceTurret : public NPC
 {
-  NewObjectListDeclaration(SpaceTurret);
+  ObjectListDeclaration(SpaceTurret);
 
 public: