Changeset 2501 for code/branches/presentation/src/orxonox/objects/weaponSystem

Timestamp:

Dec 17, 2008, 9:11:12 AM (16 years ago)

Author:

landauf

Message:

• GlobalShader in dedicated mode works again
• Shooting as a client works
• Fixed problem with NotificationQueue

Location:

code/branches/presentation/src/orxonox/objects/weaponSystem

Files:

• Weapon.cc (modified) (1 diff)
• projectiles/Projectile.cc (modified) (1 diff)

code/branches/presentation/src/orxonox/objects/weaponSystem/Weapon.cc

@@ -50 +50 @@
         this->magazineLoadingTime_ = 0;
         this->bReloading_ = false;
+
+        this->setObjectMode(0x0);
     }
 

code/branches/presentation/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc

@@ -54 +54 @@
 
         // Get notification about collisions
-        this->enableCollisionCallback();
 
-        this->setCollisionType(Kinematic);
+        if (Core::isMaster())
+        {
+            this->enableCollisionCallback();
 
-        SphereCollisionShape* shape = new SphereCollisionShape(this);
-        shape->setRadius(10);
-        this->attachCollisionShape(shape);
+            this->setCollisionType(Kinematic);
 
-        if(Core::isMaster())
-          this->destroyTimer_.setTimer(this->lifetime_, false, this, createExecutor(createFunctor(&Projectile::destroyObject)));
+            SphereCollisionShape* shape = new SphereCollisionShape(this);
+            shape->setRadius(10);
+            this->attachCollisionShape(shape);
+
+            this->destroyTimer_.setTimer(this->lifetime_, false, this, createExecutor(createFunctor(&Projectile::destroyObject)));
+        }
     }