Changeset 9949 for code/trunk

Timestamp:

Jan 3, 2014, 3:14:19 PM (11 years ago)

Author:

landauf

Message:

removed duplicate code. there is no need for a second constructor. if at all, use a factory method.

Location:

code/trunk/src/orxonox/worldentities

Files:

• BigExplosion.cc (modified) (1 diff)
• BigExplosion.h (modified) (1 diff)
• pawns/Pawn.cc (modified) (3 diffs)

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

@@ -78 +78 @@
     }
 
-    BigExplosion::BigExplosion(Context* context, Vector3 initVelocity) : MobileEntity(context)
-    {
-        RegisterObject(BigExplosion);
-        this->setVelocity(initVelocity);
-
-        if ( GameMode::showsGraphics() && ( !this->getScene() || !this->getScene()->getSceneManager() ) )
-            ThrowException(AbortLoading, "Can't create BigExplosion, no scene or no scene manager given.");
-
-        this->bStop_ = false;
-        this->LOD_ = LODParticle::Normal;
-
-        if ( GameMode::showsGraphics() )
-        {
-            try
-            {
-                this->init();
-            }
-            catch (const std::exception& ex)
-            {
-                orxout(internal_error) << "Couldn't load particle effect in BigExplosion: " << ex.what() << endl;
-                this->initZero();
-            }
-        }
-        else
-        {
-            this->initZero();
-        }
-
-        if (GameMode::isMaster())
-        {
-            this->destroyTimer_.setTimer(rnd(2, 4), false, createExecutor(createFunctor(&BigExplosion::stop, this)));
-        }
-
-        this->registerVariables();
-    }
-
     void BigExplosion::init()
     {

code/trunk/src/orxonox/worldentities/BigExplosion.h

@@ -41 +41 @@
         public:
             BigExplosion(Context* context);
-            BigExplosion(Context* context, Vector3 initVelocity);
             virtual ~BigExplosion();
 

code/trunk/src/orxonox/worldentities/pawns/Pawn.cc

@@ -120 +120 @@
                 this->weaponSystem_->destroy();
         }
-
     }
 
@@ -151 +150 @@
         XMLPortParam ( RadarViewable, "radarname", setRadarName, getRadarName, xmlelement, mode );
     }
-
 
     void Pawn::registerVariables()
@@ -380 +378 @@
         this->setDestroyWhenPlayerLeft(false);
 
-        BigExplosion* chunk = new BigExplosion(this->getContext(), this->getVelocity());
+        BigExplosion* chunk = new BigExplosion(this->getContext());
         chunk->setPosition(this->getPosition());
-        // chunk->setVelocity(this->getVelocity());
+        chunk->setVelocity(this->getVelocity());
 
         this->explosionSound_->setPosition(this->getPosition());