Changeset 9705 in orxonox.OLD for branches/new_class_id/src/world_entities/player.cc

Timestamp:

Aug 25, 2006, 9:44:53 PM (18 years ago)

Author:

bensch

Message:

adapted many more classes

File:

• branches/new_class_id/src/world_entities/player.cc (modified) (5 diffs)

branches/new_class_id/src/world_entities/player.cc

@@ -19 +19 @@
 #include "event_handler.h"
 
-
-#include "class_list.h"
 #include "state.h"
 #include "util/hud.h"
@@ -26 +24 @@
 #include "debug.h"
 
-
+NewObjectListDefinition(Player);
 /**
  * creates a new Player
@@ -33 +31 @@
 {
   //  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
-  this->setClassID(CL_PLAYER, "Player");
+  this->registerObject(this, Player::_objectList);
 
   PRINTF(4)("PLAYER INIT\n");
@@ -94 +92 @@
 
 
- void Player::weaponConfigChanged()
- {
-   this->_hud.updateWeaponManager();
- }
+void Player::weaponConfigChanged()
+{
+  this->_hud.updateWeaponManager();
+}
 
 
@@ -103 +101 @@
 {
   /// FIXME this should be in the ObjectManager
-  const std::list<BaseObject*>* objectList = ClassList::getList(CL_PLAYABLE);
-  if (objectList != NULL)
+  for (NewObjectList<Playable>::const_iterator node = Playable::objectList().begin();
+       node != Playable::objectList().end();
+       ++node)
   {
-    std::list<BaseObject*>::const_iterator node;
-    for (node = objectList->begin(); node != objectList->end(); node++)
-      if (this->playable != (*node) &&
-          (dynamic_cast<PNode*>(*node)->getAbsCoor() - this->playable->getAbsCoor()).len() < (dynamic_cast<Playable*>(*node)->getEnterRadius()))
-      {
+    if (this->playable != (*node) &&
+        ((*node)->getAbsCoor() - this->playable->getAbsCoor()).len() < ((*node)->getEnterRadius()))
+    {
 
-        this->setPlayable(dynamic_cast<Playable*>(*node));
+      this->setPlayable(*(node));
 
-        break;
-      }
+      break;
+    }
   }
 }