Changeset 1732

Timestamp:

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

Author:

scheusso

Message:

another fixed

Location:

code/branches/network/src

Files:

• network/Client.h (modified) (1 diff)
• network/Host.cc (modified) (1 diff)
• network/Host.h (modified) (1 diff)
• network/packet/Welcome.cc (modified) (2 diffs)
• orxonox/objects/Ambient.h (modified) (1 diff)
• orxonox/objects/SpaceShip.cc (modified) (5 diffs)

code/branches/network/src/network/Client.h

@@ -80 +80 @@
     unsigned int shipID(){return shipID_;}
     int playerID(){return clientID_;}
-    static void setShipID( unsigned int shipID){ dynamic_cast<Client *>(instance_)->shipID_=shipID; }
+    //static void setShipID( unsigned int shipID){ dynamic_cast<Client *>(instance_)->shipID_=shipID; }
     static void setClientID( unsigned int clientID){ dynamic_cast<Client *>(instance_)->clientID_=clientID; }
     

code/branches/network/src/network/Host.cc

@@ -48 +48 @@
 }
 
-unsigned int Host::getShipID(){ 
-  if(!instance_)
-    return 0;
-  return instance_->shipID();
-}
+// unsigned int Host::getShipID(){ 
+//   if(!instance_)
+//     assert(0);
+//   return instance_->shipID();
+// }
 
 }//namespace network

code/branches/network/src/network/Host.h

@@ -61 +61 @@
 //     static bool receiveChat(packet::Chat *message, unsigned int clientID);
     static int getPlayerID();
-    static unsigned int getShipID();
+    static unsigned int getShipID(){return instance_->shipID_;}
     static void setClientID(unsigned int id){ instance_->clientID_ = id; }
     static void setShipID(unsigned int id){ instance_->shipID_ = id; }

code/branches/network/src/network/packet/Welcome.cc

@@ -32 +32 @@
 #include "Welcome.h"
 #include "network/Host.h"
+#include "core/CoreIncludes.h"
 #include <assert.h>
 
@@ -77 +78 @@
   Host::setClientID(clientID);
   Host::setShipID(shipID);
+  COUT(3) << "Welcome set clientId: " << clientID << " shipID: " << shipID << std::endl;
   delete this;
   return true;

code/branches/network/src/orxonox/objects/Ambient.h

@@ -38 +38 @@
 namespace orxonox
 {
-    class _OrxonoxExport Ambient : public BaseObject, network::Synchronisable
+    class _OrxonoxExport Ambient : public BaseObject, public network::Synchronisable
     {
         public:

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));