Changeset 1732 for code/branches/network/src/orxonox/objects/SpaceShip.cc

Timestamp:

Sep 7, 2008, 4:33:09 PM (16 years ago)

Author:

scheusso

Message:

another fixed

File:

• code/branches/network/src/orxonox/objects/SpaceShip.cc (modified) (5 diffs)

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

@@ -76 +76 @@
           return *it;
       }
-      return NULL;
+      return 0;
     }
 
@@ -158 +158 @@
     bool SpaceShip::create(){
       if(!myShip_){
+        if(network::Host::running())
+          COUT(3) << "this id: " << this->objectID << " myShipID: " << network::Host::getShipID() << std::endl;
         if(network::Host::running() && objectID == network::Host::getShipID())
           myShip_=true;
@@ -163 +165 @@
           HUD::getSingleton().addRadarObject(this, this->getProjectileColour());
       }
-      if(Model::create())
-        this->init();
-      else
-        return false;
+      assert(Model::create());
+      this->init();
       return true;
     }
@@ -287 +287 @@
 
     void SpaceShip::getFocus(){
-      COUT(4) << "requesting focus" << std::endl;
+      COUT(3) << "requesting focus" << std::endl;
       //if(!network::Host::running() || network::Host::getShipID()==objectID)
       if(myShip_)
@@ -301 +301 @@
 //       COUT(4) << "begin camera creation" << std::endl;
       this->camNode_ = this->getNode()->createChildSceneNode(camName_);
-      COUT(4) << "position: (this)" << this->getNode()->getPosition() << std::endl;
+      COUT(3) << "position: (this)" << this->getNode()->getPosition() << std::endl;
       this->camNode_->setPosition(Vector3(-25,0,5));
 //      Quaternion q1 = Quaternion(Radian(Degree(90)),Vector3(0,-1,0));