Changeset 3087 for code/trunk/src/orxonox/objects/worldentities/BigExplosion.cc

Timestamp:

May 27, 2009, 2:45:54 PM (15 years ago)

Author:

landauf

Message:

merged particles branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities/BigExplosion.cc (copied) (copied from code/branches/particles/src/orxonox/objects/worldentities/BigExplosion.cc) (7 diffs, 1 prop)

code/trunk/src/orxonox/objects/worldentities/BigExplosion.cc

@@ -36 +36 @@
 #include <sstream>
 
-#include "core/Core.h"
+#include "core/GameMode.h"
 #include "core/CoreIncludes.h"
 #include "core/Executor.h"
@@ -53 +53 @@
         RegisterObject(BigExplosion);
 
-        if ( Core::showsGraphics() && ( !this->getScene() || !this->getScene()->getSceneManager() ) )
+        if ( GameMode::showsGraphics() && ( !this->getScene() || !this->getScene()->getSceneManager() ) )
             ThrowException(AbortLoading, "Can't create BigExplosion, no scene or no scene manager given.");
 /*
@@ -70 +70 @@
 */
 
-        if ( Core::showsGraphics() )
+        if ( GameMode::showsGraphics() )
         {
             try
@@ -87 +87 @@
         }
 
-        if (Core::isMaster())
+        if (GameMode::isMaster())
         {
             Vector3 velocity(rnd(-1, 1), rnd(-1, 1), rnd(-1, 1));
@@ -94 +94 @@
             this->setVelocity(velocity);
 
-            this->destroyTimer_.setTimer(rnd(4, 7), false, this, createExecutor(createFunctor(&BigExplosion::stop)));
+            this->destroyTimer_.setTimer(rnd(2, 4), false, this, createExecutor(createFunctor(&BigExplosion::stop)));
         }
         this->registerVariables();
@@ -366 +366 @@
             this->debrisSmoke4_->setEnabled(false);
 
-        if (Core::isMaster())
+        if (GameMode::isMaster())
         {
             this->bStop_ = true;
@@ -395 +395 @@
 
 
-/*        if (Core::isMaster() && rnd() < dt*(this->cps_))
+/*        if (GameMode::isMaster() && rnd() < dt*(this->cps_))
         {