Changeset 11083 for code/trunk/src/modules

Timestamp:

Jan 21, 2016, 1:59:04 PM (8 years ago)

Author:

muemart

Message:

Fix some clang-tidy warnings.
Also, Serialise.h was doing some C-style casts that ended up being const casts. I moved those const casts as close to the source as possible and changed the loadAndIncrease functions to not do that.

Location:

code/trunk/src/modules

Files:

• gametypes/SpaceRaceController.cc (modified) (1 diff)
• hover/TimeHUD.cc (modified) (1 diff)
• invader/Invader.cc (modified) (1 diff)
• invader/InvaderEnemy.cc (modified) (1 diff)
• invader/InvaderEnemy.h (modified) (1 diff)
• invader/InvaderEnemyShooter.cc (modified) (1 diff)
• objects/ForceField.cc (modified) (2 diffs)
• objects/ForceField.h (modified) (2 diffs)
• objects/SpaceBoundaries.cc (modified) (1 diff)
• objects/triggers/DistanceTrigger.h (modified) (1 diff)
• objects/triggers/EventTrigger.h (modified) (1 diff)
• overlays/hud/ChatOverlay.cc (modified) (1 diff)
• pickup/items/ShrinkPickup.cc (modified) (1 diff)
• pong/Pong.cc (modified) (2 diffs)
• questsystem/QuestListener.cc (modified) (1 diff)
• questsystem/effects/ChangeQuestStatus.h (modified) (1 diff)
• tetris/Tetris.cc (modified) (2 diffs)
• tetris/TetrisBrick.cc (modified) (1 diff)
• tetris/TetrisStone.cc (modified) (1 diff)
• towerdefense/TDCoordinate.cc (modified) (1 diff)
• towerdefense/TowerDefense.cc (modified) (3 diffs)
• weapons/projectiles/GravityBombField.cc (modified) (2 diffs)

code/trunk/src/modules/gametypes/SpaceRaceController.cc

@@ -397 +397 @@
     bool SpaceRaceController::vergleicheQuader(const Vector3& pointToPoint, const Vector3& groesse)
     {
-        if(abs(pointToPoint.x) < groesse.x)
+        if(std::abs(pointToPoint.x) < groesse.x)
             return true;
-        if(abs(pointToPoint.y) < groesse.y)
+        if(std::abs(pointToPoint.y) < groesse.y)
             return true;
-        if(abs(pointToPoint.z) < groesse.z)
+        if(std::abs(pointToPoint.z) < groesse.z)
             return true;
         return false;

code/trunk/src/modules/hover/TimeHUD.cc

@@ -82 +82 @@
         {
             this->setCaption(getTimeString(this->time_));
+            if (this->hoverGame_->getNumberOfFlags() == 0)
+                setRunning(false);
         }
-        if(this->hoverGame_->getNumberOfFlags() == 0)
-            setRunning(false);
         
     }

code/trunk/src/modules/invader/Invader.cc

@@ -129 +129 @@
                 newPawn->addTemplate("enemyinvader");
             }
-            newPawn->setPlayer(player);
+            newPawn->setInvaderPlayer(player);
             newPawn->level = level;
             // spawn enemy at random points in front of player.

code/trunk/src/modules/invader/InvaderEnemy.cc

@@ -58 +58 @@
         if (player != nullptr)
         {
-            float newZ = 2/(pow(abs(getPosition().x - player->getPosition().x) * 0.01f, 2) + 1) * (player->getPosition().z - getPosition().z);
+            float newZ = 2/(pow(std::abs(getPosition().x - player->getPosition().x) * 0.01f, 2) + 1) * (player->getPosition().z - getPosition().z);
             setVelocity(Vector3(1000.f - level * 100 , 0, newZ));
         }

code/trunk/src/modules/invader/InvaderEnemy.h

@@ -49 +49 @@
             virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
             virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) override;
-            virtual void setPlayer(InvaderShip* player){this->player = player;}
+            virtual void setInvaderPlayer(InvaderShip* player){this->player = player;}
 
             int level;

code/trunk/src/modules/invader/InvaderEnemyShooter.cc

@@ -63 +63 @@
             float distPlayer = player->getPosition().z - getPosition().z;
             // orxout() << "i'm different!" << endl;
-            float newZ = 2/(pow(abs(getPosition().x - player->getPosition().x) * 0.01f, 2) + 1) * distPlayer;
-            setVelocity(Vector3(950 - abs(distPlayer), 0, newZ));
+            float newZ = 2/(pow(std::abs(getPosition().x - player->getPosition().x) * 0.01f, 2) + 1) * distPlayer;
+            setVelocity(Vector3(950 - std::abs(distPlayer), 0, newZ));
         }
         Pawn::tick(dt);

code/trunk/src/modules/objects/ForceField.cc

@@ -63 +63 @@
         //Standard Values
         this->setDirection(Vector3::ZERO);
-        this->setVelocity(100);
+        this->setFieldVelocity(100);
         this->setDiameter(500);
         this->setMassDiameter(0);   //! We allow point-masses
@@ -88 +88 @@
         SUPER(ForceField, XMLPort, xmlelement, mode);
 
-        XMLPortParam(ForceField, "velocity", setVelocity, getVelocity, xmlelement, mode).defaultValues(100);
+        XMLPortParam(ForceField, "velocity", setFieldVelocity, getFieldVelocity, xmlelement, mode).defaultValues(100);
         XMLPortParam(ForceField, "diameter", setDiameter, getDiameter, xmlelement, mode).defaultValues(500);
         XMLPortParam(ForceField, "massDiameter", setMassDiameter, getMassDiameter, xmlelement, mode).defaultValues(0);

code/trunk/src/modules/objects/ForceField.h

@@ -98 +98 @@
             @param vel The velocity to be set.
             */
-            inline void setVelocity(float vel)
+            inline void setFieldVelocity(float vel)
                 { this->velocity_ = vel; }
             /**
@@ -104 +104 @@
             @return Returns the velocity of the ForceField.
             */
-            inline float getVelocity()
+            inline float getFieldVelocity()
                 { return this->velocity_; }
 

code/trunk/src/modules/objects/SpaceBoundaries.cc

@@ -221 +221 @@
                     }
                 }
-                if(/* humanItem &&*/ abs(this->maxDistance_ - distance) < this->showDistance_ )
+                if(/* humanItem &&*/ std::abs(this->maxDistance_ - distance) < this->showDistance_ )
                 {
                     this->displayBoundaries(currentPawn, 1.0f - fabs(this->maxDistance_ - distance) / this->showDistance_); // Show the boundary

code/trunk/src/modules/objects/triggers/DistanceTrigger.h

@@ -97 +97 @@
             virtual ~DistanceTrigger();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); // Method for creating a DistanceTrigger object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; // Method for creating a DistanceTrigger object through XML.
 
             void addTarget(const std::string& targets); // Add some target to the DistanceTrigger.

code/trunk/src/modules/objects/triggers/EventTrigger.h

@@ -73 +73 @@
             virtual ~EventTrigger();
 
-            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode); // Creates an event port.
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override; // Creates an event port.
 
             /**

code/trunk/src/modules/overlays/hud/ChatOverlay.cc

@@ -73 +73 @@
         Timer* timer = new Timer();
         this->timers_.insert(timer); // store the timer in a set to destroy it in the destructor
-        const ExecutorPtr& executor = createExecutor(createFunctor(&ChatOverlay::dropMessage, this));
+        const ExecutorPtr executor = createExecutor(createFunctor(&ChatOverlay::dropMessage, this));
         executor->setDefaultValues(timer);
         timer->setTimer(this->displayTime_, false, executor, true);

code/trunk/src/modules/pickup/items/ShrinkPickup.cc

@@ -277 +277 @@
             {
                 Pawn* pawn = this->carrierToPawnHelper();
-                if(pawn == nullptr) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
+                if (pawn == nullptr) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
+                {
                     this->Pickupable::destroy();
+                    return;
+                }
 
                 this->timeRemainig_ -= dt;

code/trunk/src/modules/pong/Pong.cc

@@ -326 +326 @@
     PlayerInfo* Pong::getLeftPlayer() const
     {
-        if (this->bat_ != nullptr && this->bat_[0] != nullptr)
+        if (this->bat_[0] != nullptr)
             return this->bat_[0]->getPlayer();
         else
@@ -340 +340 @@
     PlayerInfo* Pong::getRightPlayer() const
     {
-        if (this->bat_ != nullptr && this->bat_[1] != nullptr)
+        if (this->bat_[1] != nullptr)
             return this->bat_[1]->getPlayer();
         else

code/trunk/src/modules/questsystem/QuestListener.cc

@@ -81 +81 @@
         XMLPortParam(QuestListener, "mode", setMode, getMode, xmlelement, mode);
 
-        if(this->quest_ != nullptr)
+        std::string questid;
+
+        if (this->quest_ != nullptr)
+        {
             this->quest_->addListener(this); // Adds the QuestListener to the Quests list of listeners.
-
-        orxout(verbose, context::quests) << "QuestListener created for quest: {" << this->quest_->getId() << "} with mode '" << this->getMode() << "'." << endl;
+            questid = this->quest_->getId();
+        }
+
+        orxout(verbose, context::quests) << "QuestListener created for quest: {" << questid << "} with mode '" << this->getMode() << "'." << endl;
     }
 

code/trunk/src/modules/questsystem/effects/ChangeQuestStatus.h

@@ -61 +61 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a ChangeQuestStatus object through XML.
 
-            virtual bool invoke(PlayerInfo* player) = 0; //!< Invokes the QuestEffect.
-
         protected:
             /**

code/trunk/src/modules/tetris/Tetris.cc

@@ -140 +140 @@
             const Vector3& currentStonePosition = someStone->getPosition(); //!< Saves the position of the currentStone
 
-            if((position.x == currentStonePosition.x) && abs(position.y-currentStonePosition.y) < this->center_->getStoneSize())
+            if((position.x == currentStonePosition.x) && std::abs(position.y-currentStonePosition.y) < this->center_->getStoneSize())
                 return false;
         }
@@ -222 +222 @@
         if(position.y < this->center_->getStoneSize()/2.0f) //!< If the stone has reached the bottom of the level
         {
-            float baseOffset = abs(stone->getPosition().y);
+            float baseOffset = std::abs(stone->getPosition().y);
             if (this->activeBrick_->getRotationCount() == 1 || this->activeBrick_->getRotationCount() == 3)
-                baseOffset = abs(stone->getPosition().x);
+                baseOffset = std::abs(stone->getPosition().x);
             float yOffset = baseOffset + this->center_->getStoneSize()/2.0f;//calculate offset
             if(yOffset < 0) //catch brake-throughs

code/trunk/src/modules/tetris/TetrisBrick.cc

@@ -213 +213 @@
         {
             const Vector3& position = this->getPosition();
-            Vector3 newPos = Vector3(position.x+value.x/abs(value.x)*this->size_, position.y, position.z);
+            Vector3 newPos = Vector3(position.x+value.x/std::abs(value.x)*this->size_, position.y, position.z);
             if(!this->isValidMove(newPos))
                 return;

code/trunk/src/modules/tetris/TetrisStone.cc

@@ -92 +92 @@
         {
             const Vector3& position = this->getPosition();
-            Vector3 newPos = Vector3(position.x+value.x/abs(value.x)*this->size_, position.y, position.z);
+            Vector3 newPos = Vector3(position.x+value.x/std::abs(value.x)*this->size_, position.y, position.z);
             if(!this->tetris_->isValidMove(this, newPos))
                 return;

code/trunk/src/modules/towerdefense/TDCoordinate.cc

@@ -66 +66 @@
         float tileScale = 100;
 
-        Vector3 *coord = new Vector3();
-        coord->x= (_x-8) * tileScale;
-        coord->y= (_y-8) * tileScale;
-        coord->z=0;
+        Vector3 coord;
+        coord.x= (_x-8) * tileScale;
+        coord.y= (_y-8) * tileScale;
+        coord.z=0;
 
-        return *coord;
+        return coord;
     }
 }

code/trunk/src/modules/towerdefense/TowerDefense.cc

@@ -377 +377 @@
     {        
         TowerDefenseField* thisField = fields_[thisCoord->GetX()][thisCoord->GetY()];
-        TDCoordinate* nextCoord = new TDCoordinate(0,0);
 
         if (thisField->getType() != TowerDefenseFieldType::STREET && thisField->getType() != TowerDefenseFieldType::START)
@@ -384 +383 @@
         }
 
+        TDCoordinate* nextCoord = new TDCoordinate(0, 0);
+
         if (thisField->getAngle() == 0)
         {
@@ -406 +407 @@
         }
 
+        delete nextCoord;
         return nullptr;
     }

code/trunk/src/modules/weapons/projectiles/GravityBombField.cc

@@ -34 +34 @@
         fieldExploded_ = false;
 
-        setVelocity(FORCE_SPHERE_START_STRENGTH);
+        setFieldVelocity(FORCE_SPHERE_START_STRENGTH);
         setDiameter(2*FORCE_SPHERE_START_RADIUS);
         setMode(modeSphere_s);
@@ -158 +158 @@
         
         setDiameter(forceSphereRadius_*2);
-        setVelocity(forceStrength_);
+        setFieldVelocity(forceStrength_);
         if(lifetime_>0) particleSphere_->setScale(forceSphereRadius_/FORCE_SPHERE_START_RADIUS);
         bombModel_->setScale(modelScaling_);