Changeset 9061 in orxonox.OLD for trunk/src/world_entities/player.cc

Timestamp:

Jul 3, 2006, 6:39:10 PM (19 years ago)

Author:

patrick

Message:

merged the single_player branche to trunk

File:

• trunk/src/world_entities/player.cc (modified) (4 diffs)

trunk/src/world_entities/player.cc

@@ -32 +32 @@
 Player::Player()
 {
-//  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
+  //  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
   this->setClassID(CL_PLAYER, "Player");
 
@@ -74 +74 @@
   {
     PRINTF(4)("Enter new Playable\n");
-      this->playable = playable;
-      this->_hud.setEnergyWidget(this->playable->getHealthWidget());
-      this->_hud.setWeaponManager(&this->playable->getWeaponManager());
+    this->playable = playable;
+    this->hud.setEnergyWidget(this->playable->getHealthWidget());
+    this->hud.setWeaponManager(&this->playable->getWeaponManager());
 
-      this->playable->setPlayer(this);
-      return true;
+    this->playable->setPlayer(this);
+    return true;
   }
 
@@ -89 +89 @@
 
 bool Player::eject()
- {
-   return this->setPlayable(NULL);
- }
+{
+  return this->setPlayable(NULL);
+}
 
 
@@ -99 +99 @@
  }
 
- void Player::process(const Event &event)
- {
-   if (event.type == KeyMapper::PEV_CHANGE_SHIP && event.bPressed)
-   {
-     /// FIXME this should be in the ObjectManager
-     const std::list<BaseObject*>* objectList = ClassList::getList(CL_PLAYABLE);
-     if (objectList != NULL)
-     {
-       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() < 10.0)
-       {
 
-         this->setPlayable(dynamic_cast<Playable*>(*node));
+void Player::enterNewPlayable()
+{
+  /// FIXME this should be in the ObjectManager
+  const std::list<BaseObject*>* objectList = ClassList::getList(CL_PLAYABLE);
+  if (objectList != NULL)
+  {
+    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()))
+      {
 
-         break;
-       }
-     }
-   }
+        this->setPlayable(dynamic_cast<Playable*>(*node));
 
-   if (likely(this->playable != NULL))
-     this->playable->process(event);
- }
+        break;
+      }
+  }
+}
 
+
+void Player::process(const Event &event)
+{
+  if (event.type == KeyMapper::PEV_CHANGE_SHIP && event.bPressed)
+  {
+    this->enterNewPlayable();
+  }
+
+  if (likely(this->playable != NULL))
+    this->playable->process(event);
+}
+