Changeset 10397 for code/branches/towerdefenseFS15/src/modules

Timestamp:

Apr 26, 2015, 12:29:30 PM (10 years ago)

Author:

fvultier

Message:

Added missmissing #include _.h Now the program compiles without any error.

Location:

code/branches/towerdefenseFS15/src/modules/towerdefense

Files:

• CMakeLists.txt (modified) (1 diff)
• TowerDefense.cc (modified) (2 diffs)
• TowerDefense.h (modified) (2 diffs)
• TowerDefenseSelecter.cc (modified) (1 diff)
• TowerDefenseSelecter.h (modified) (2 diffs)

code/branches/towerdefenseFS15/src/modules/towerdefense/CMakeLists.txt

@@ -7 +7 @@
   TDCoordinate.cc
   TowerDefenseEnemy.cc
- # TowerDefenseSelecter.cc
-
+  TowerDefenseSelecter.cc
 )
 

code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc

@@ -109 +109 @@
         }*/
 
-        this->Selecter = new TowerDefenseSelecter(context);
+        selecter = NULL;
 
 
@@ -149 +149 @@
 
 // Waypoints: [1,3] [10,3] [10,11] [13,11] -> add the points to a matrix so the player cant place towers on the path
-        for (int i=0; i < 16 ; i++){
-            for (int j = 0; j< 16 ; j++){
+        for (int i=0; i < 16 ; i++)
+        {
+            for (int j = 0; j< 16 ; j++)
+            {
                 towerModelMatrix[i][j] = NULL;
                 towerTurretMatrix[i][j] = NULL;
             }
         }
+
+        selecter = new TowerDefenseSelecter(this->center_->getContext());
 
         Model* dummyModel = new Model(this->center_->getContext());

code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.h

@@ -38 +38 @@
 #define _TowerDefense_H__
 #include "TDCoordinate.h"
+#include "TowerDefenseSelecter.h"
 #include "towerdefense/TowerDefensePrereqs.h"
 #include "gametypes/TeamDeathmatch.h"
@@ -75 +76 @@
         int reduceLifes(int NumberofLifes){ return lifes_-=NumberofLifes; }
         TDCoordinate* selectedPos;
-        TowerDefenseSelecter* Selecter;
+        TowerDefenseSelecter* selecter;
 
         //virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);

code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseSelecter.cc

@@ -54 +54 @@
 
         Model* selecterModel = new Model(context);
-        selecterModel->setMeshSource("Cube.mesh");
+        selecterModel->setMeshSource("cube.mesh");
         selecterModel->setScale(45);
 

code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseSelecter.h

@@ -32 +32 @@
 #include "towerdefense/TowerDefensePrereqs.h"
 #include "worldentities/ControllableEntity.h"
+#include "TDCoordinate.h"
 
 namespace orxonox
@@ -39 +40 @@
         public:
             TowerDefenseSelecter(Context* context); //!< Constructor. Registers and initializes the object.
-            virtual ~TowerDefenseSelecter() {}
+            virtual ~TowerDefenseSelecter();
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             virtual void tick(float dt);