Changeset 3088 for code/trunk/src

Timestamp:

May 27, 2009, 4:09:13 PM (16 years ago)

Author:

scheusso

Message:

fix in Projectile (there was no createFactory) and some additional debugging
and in hubtimer (only on server now)
and in lightninggun (material is synchronised)

Location:

code/trunk/src

Files:

• network/synchronisable/Synchronisable.cc (modified) (2 diffs)
• orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc (modified) (1 diff)
• orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.h (modified) (1 diff)
• orxonox/objects/weaponsystem/projectiles/Projectile.cc (modified) (1 diff)
• orxonox/overlays/hud/HUDTimer.cc (modified) (1 diff)

code/trunk/src/network/synchronisable/Synchronisable.cc

@@ -144 +144 @@
     if (!id)
     {
-        for(int i = 0; i<100; i++)
+        for(int i = 0; i<160; i++)
             COUT(0) << "classid: " << i << " identifier: " << ClassByID(i) << endl;
         COUT(0) << "Assertion failed: id" << std::endl;
@@ -251 +251 @@
         this->classID = this->getIdentifier()->getNetworkID();
 
+    assert(ClassByID(this->classID));
     assert(this->classID==this->getIdentifier()->getNetworkID());
     std::vector<SynchronisableVariableBase*>::iterator i;

code/trunk/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc

@@ -48 +48 @@
         this->maxTextureIndex_ = 8;
         this->textureTimer_.setTimer(0.01, true, this, createExecutor(createFunctor(&LightningGunProjectile::changeTexture)));
+        
+        registerVariables();
+    }
+    
+    void LightningGunProjectile::registerVariables()
+    {
+        registerVariable(this->materialBase_);
     }
     

code/trunk/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.h

@@ -52 +52 @@
             Timer<LightningGunProjectile> textureTimer_;
             std::string materialBase_;
+      private:
+            void registerVariables();
     };
 }

code/trunk/src/orxonox/objects/weaponsystem/projectiles/Projectile.cc

@@ -45 +45 @@
 namespace orxonox
 {
+    CreateFactory(Projectile);
+  
     Projectile::Projectile(BaseObject* creator) : MovableEntity(creator)
     {

code/trunk/src/orxonox/overlays/hud/HUDTimer.cc

@@ -55 +55 @@
 
     Gametype* gametype = this->getGametype();
-
-    if (gametype->getTimerIsActive())
+    
+    if(gametype)
     {
-      this->setCaption(convertToString((int)gametype->getTime() + 1));
+      if (gametype->getTimerIsActive())
+      {
+        this->setCaption(convertToString((int)gametype->getTime() + 1));
+      }
     }
   }