Changeset 1534 for code/trunk/src/orxonox

Timestamp:

Jun 4, 2008, 8:53:10 PM (16 years ago)

Author:

rgrieder

Message:

merged network branch back to trunk

Location:

code/trunk/src/orxonox

Files:

• Orxonox.cc (modified) (2 diffs)
• objects/SpaceShip.cc (modified) (3 diffs)
• objects/SpaceShip.h (modified) (1 diff)

code/trunk/src/orxonox/Orxonox.cc

@@ -127 +127 @@
       network::Client::destroySingleton();
     if (server_g)
-      delete server_g;
+      delete network::Server::getSingleton();
   }
 
@@ -303 +303 @@
     COUT(2) << "Loading level in server mode" << std::endl;
 
-    server_g = new network::Server(serverPort_);
+    //server_g = new network::Server(serverPort_);
+    server_g = network::Server::createSingleton(serverPort_);
 
     if (!loadScene())

code/trunk/src/orxonox/objects/SpaceShip.cc

@@ -69 +69 @@
     SpaceShip* SpaceShip::instance_s;
 
+    
     SpaceShip *SpaceShip::getLocalShip(){
       Iterator<SpaceShip> it;
@@ -163 +164 @@
 
     void SpaceShip::registerAllVariables(){
-      registerVar( &camName_, camName_.length()+1, network::STRING, 0x1);
+      registerVar( &camName_, camName_.length()+1, network::STRING, 0x1 );
       registerVar( &maxSpeed_, sizeof(maxSpeed_), network::DATA, 0x1);
       registerVar( &maxSideAndBackSpeed_, sizeof(maxSideAndBackSpeed_), network::DATA, 0x1);
@@ -469 +470 @@
         if( myShip_ )
         {
-          COUT(4) << "steering our ship: " << objectID << std::endl;
+          COUT(5) << "steering our ship: " << objectID << std::endl;
           this->acceleration_.x = 0;
           this->acceleration_.y = 0;

code/trunk/src/orxonox/objects/SpaceShip.h

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