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

Timestamp:

Feb 2, 2006, 5:58:33 PM (18 years ago)

Author:

bensch

Message:

trunk: brainfuck: interface to Playable much bea now

File:

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

trunk/src/world_entities/player.cc

@@ -49 +49 @@
 Player::~Player ()
 {
-
+  this->setPlayable(NULL);
 }
 
@@ -55 +55 @@
 bool Player::setPlayable(Playable* playable)
 {
-  if(playable != NULL && playable->subscribePlayer(this))
+  if (this->playable == playable)
+    return false;
+
+  // get out of the current Playable
+  if (this->playable != NULL)
   {
+    printf("Player gets ejected from Playable\n");
+    this->hud.setEnergyWidget(NULL);
+    this->hud.setWeaponManager(NULL);
+
+    Playable* ejectedPlayable = this->playable;
+
+    this->playable = NULL;
+    ejectedPlayable->setPlayer(NULL);
+  }
+
+  if (playable != NULL)
+  {
+    printf("Enter new Playable\n");
       this->playable = playable;
       this->hud.setEnergyWidget(this->playable->getHealthWidget());
       this->hud.setWeaponManager(this->playable->getWeaponManager());
+
+      this->playable->setPlayer(this);
       return true;
   }
-  else
-    return false;
+
+  printf("no change\n");
+  return true;
 }
 
-bool Player::disconnectPlayable()
+bool Player::eject()
  {
-   if(this->playable == NULL) return true;
+   this->setPlayable(NULL);
+ }
 
-   if(this->playable->unsubscribePlayer(this))
-   {
-     this->playable = NULL;
-     this->hud.setEnergyWidget(NULL);
-     this->hud.setWeaponManager(NULL);
-     return true;
-   }
-   else
-     return false;
- }
 
  void Player::weaponConfigChanged()
@@ -99 +110 @@
        {
 
-         this->disconnectPlayable();
          this->setPlayable(dynamic_cast<Playable*>(*node));