Changeset 1901 for code/branches/network/src/orxonox/objects/Projectile.cc

Timestamp:

Oct 12, 2008, 12:15:30 PM (16 years ago)

Author:

scheusso

Message:

Lots of changes:
Some fixes/hacks in objects
Changes in Gamestates and bugfixes
Removed some asserts

File:

• code/branches/network/src/orxonox/objects/Projectile.cc (modified) (2 diffs)

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

@@ -41 +41 @@
 #include "ParticleSpawner.h"
 #include "Model.h"
+#include "Settings.h"
 
 namespace orxonox
@@ -64 +65 @@
         }
 
-        this->destroyTimer_.setTimer(this->lifetime_, false, this, createExecutor(createFunctor(&Projectile::destroyObject)));
+        if(!orxonox::Settings::isClient()) //only if not on client
+          this->destroyTimer_.setTimer(this->lifetime_, false, this, createExecutor(createFunctor(&Projectile::destroyObject)));
     }