Changeset 1306 for code/branches/merge/src

Timestamp:

May 15, 2008, 11:33:46 PM (17 years ago)

Author:

scheusso

Message:

found a 'bug' in projectile - we set the networkid now everytime in constructor of projectile

Location:

code/branches/merge/src

Files:

• network/Server.cc (modified) (1 diff)
• network/Synchronisable.cc (modified) (1 diff)
• orxonox/objects/Projectile.cc (modified) (1 diff)
• orxonox/objects/SpaceShip.cc (modified) (1 diff)

code/branches/merge/src/network/Server.cc

@@ -149 +149 @@
     processQueue();
     updateGamestate();
-
 //     usleep(500000); // TODO remove
     return;

code/branches/merge/src/network/Synchronisable.cc

@@ -155 +155 @@
     //std::cout << "inside getData" << std::endl;
     if(classID==0)
-      COUT(3) << "classid 0" << std::endl;
+      COUT(3) << "classid 0 " << this->getIdentifier()->getName() << std::endl;
     classID=this->getIdentifier()->getNetworkID();
     std::list<synchronisableVariable *>::iterator i;

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

@@ -63 +63 @@
 
         this->destroyTimer_.setTimer(this->lifetime_, false, this, createExecutor(createFunctor(&Projectile::destroyObject)));
+        this->classID = this->getIdentifier()->getNetworkID(); // TODO: remove this hack
+//        COUT(3) << this->classID << std::endl;
     }
 

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

@@ -456 +456 @@
         if (this->bLMousePressed_ && this->timeToReload_ <= 0)
         {
+          
             Projectile *p = new Projectile(this);
+            
             p->setBacksync(true);
             this->timeToReload_ = this->reloadTime_;