Changeset 1318 for code/branches/merge/src/orxonox

Timestamp:

May 18, 2008, 10:00:17 PM (16 years ago)

Author:

scheusso

Message:

made clientinformation threadsafe and improved packetbuffer; wrote a static function SpaceShip *SpaceShip::getLocalShip. it returns the pointer to the ship that should be steered

Location:

code/branches/merge/src/orxonox/objects

Files:

• SpaceShip.cc (modified) (1 diff)
• SpaceShip.h (modified) (1 diff)

code/branches/merge/src/orxonox/objects/SpaceShip.cc

@@ -64 +64 @@
     SpaceShip* SpaceShip::instance_s;
 
+    SpaceShip *SpaceShip::getLocalShip(){
+      Iterator<SpaceShip> it;
+      for(it = ObjectList<SpaceShip>::start(); it; ++it){
+        if((it)->server_ || ( network::Client::getSingleton() && network::Client::getSingleton()->getShipID()==it->objectID ) )
+          return *it;
+      }
+      return NULL;
+    }
+    
     SpaceShip::SpaceShip() :
       //testvector_(0,0,0),

code/branches/merge/src/orxonox/objects/SpaceShip.h

@@ -44 +44 @@
     {
         public:
+          
+            static SpaceShip *getLocalShip();
+            
             SpaceShip();
             ~SpaceShip();