Changeset 11083 for code/trunk/src/modules/towerdefense

Timestamp:

Jan 21, 2016, 1:59:04 PM (9 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/towerdefense

Files:

• TDCoordinate.cc (modified) (1 diff)
• TowerDefense.cc (modified) (3 diffs)

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;
     }