Changeset 5901 in orxonox.OLD

Timestamp:

Dec 3, 2005, 7:23:37 PM (18 years ago)

Author:

snellen

Message:

disconnectControllable() in player.cc implemented

Location:

branches/spaceshipcontrol/src/world_entities

Files:

• player.cc (modified) (2 diffs)
• player.h (modified) (1 diff)
• space_ships/space_ship.cc (modified) (3 diffs)

branches/spaceshipcontrol/src/world_entities/player.cc

@@ -53 +53 @@
 
 
-
-void Player::process(const Event &event)
-{
-  if (likely(this->controllable != NULL))
-    this->controllable->process(event);
-}
-
-
 bool Player::setControllable(Playable* controllable)
 {
@@ -72 +64 @@
 }
 
+bool Player::disconnectControllable()
+ {
+   if(this->controllable == NULL) return true;
 
+   if(this->controllable->unsubscribePlayer(this))
+   {
+     this->controllable = NULL;
+     return true;
+   }
+   else
+     return false;
+ }
+
+ void Player::process(const Event &event)
+ {
+   if (likely(this->controllable != NULL))
+     this->controllable->process(event);
+ }
+

branches/spaceshipcontrol/src/world_entities/player.h

@@ -26 +26 @@
 
     bool              setControllable(Playable* controllalble);
-    void              disconnectControllable();
     inline Playable*  getControllable() { return this->controllable; };
+
+    bool              disconnectControllable();
 
     // eventListener extension.

branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.cc

@@ -256 +256 @@
   Vector move = (velocity)*time;
 
-  if( velocity.len() != 0 )
+  /*if( velocity.len() != 0 )
    {
      this->setAbsDir(Quaternion(velocity, Vector(0,1,0)) * Quaternion ( -M_PI_2, Vector(0,1,0)));
    }
-
+  */
   this->shiftCoor (move);
 
@@ -289 +289 @@
     if(velocity.len() == 0)
       accel += ((this->getAbsDir()).getSpacialAxis().getNormalized());
-    else
-      travelSpeed++;
+    //else
+      //travelSpeed++;
    }
 
@@ -297 +297 @@
     if(velocity.len() == 0)
       accel -= ((this->getAbsDir()).getSpacialAxis().getNormalized());
-    else
-    travelSpeed--;
+   // else
+     //travelSpeed--;
    }