[Orxonox-commit 5737] r10397 - code/branches/towerdefenseFS15/src/modules/towerdefense

[fvultier at orxonox.net]

Author: fvultier
Date: 2015-04-26 12:29:30 +0200 (Sun, 26 Apr 2015)
New Revision: 10397

Modified:
   code/branches/towerdefenseFS15/src/modules/towerdefense/CMakeLists.txt
   code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc
   code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.h
   code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseSelecter.cc
   code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseSelecter.h
Log:
Added missmissing #include ___.h Now the program compiles without any error.

Modified: code/branches/towerdefenseFS15/src/modules/towerdefense/CMakeLists.txt
===================================================================
--- code/branches/towerdefenseFS15/src/modules/towerdefense/CMakeLists.txt	2015-04-26 08:24:21 UTC (rev 10396)
+++ code/branches/towerdefenseFS15/src/modules/towerdefense/CMakeLists.txt	2015-04-26 10:29:30 UTC (rev 10397)
@@ -6,8 +6,7 @@
   TowerDefensePlayerStats.cc
   TDCoordinate.cc
   TowerDefenseEnemy.cc
- # TowerDefenseSelecter.cc
-
+  TowerDefenseSelecter.cc
 )
 
 ORXONOX_ADD_LIBRARY(towerdefense

Modified: code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc
===================================================================
--- code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc	2015-04-26 08:24:21 UTC (rev 10396)
+++ code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc	2015-04-26 10:29:30 UTC (rev 10397)
@@ -108,7 +108,7 @@
             }
         }*/
 
-        this->Selecter = new TowerDefenseSelecter(context);
+        selecter = NULL;
 
 
         this->setHUDTemplate("TowerDefenseHUD");
@@ -148,13 +148,17 @@
         TeamDeathmatch::start();
 
 // 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());
 
         //the path of the spacehips has to be blocked, so that no towers can be build there

Modified: code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.h
===================================================================
--- code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.h	2015-04-26 08:24:21 UTC (rev 10396)
+++ code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.h	2015-04-26 10:29:30 UTC (rev 10397)
@@ -37,6 +37,7 @@
 #ifndef _TowerDefense_H__
 #define _TowerDefense_H__
 #include "TDCoordinate.h"
+#include "TowerDefenseSelecter.h"
 #include "towerdefense/TowerDefensePrereqs.h"
 #include "gametypes/TeamDeathmatch.h"
 #include "TowerDefenseEnemy.h"
@@ -74,7 +75,7 @@
         void nextwave(){ TowerDefenseEnemyvector.clear(); waves_++; time=0;}
         int reduceLifes(int NumberofLifes){ return lifes_-=NumberofLifes; }
         TDCoordinate* selectedPos;
-        TowerDefenseSelecter* Selecter;
+        TowerDefenseSelecter* selecter;
 
         //virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
         //virtual void playerScored(PlayerInfo* player, int score);

Modified: code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseSelecter.cc
===================================================================
--- code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseSelecter.cc	2015-04-26 08:24:21 UTC (rev 10396)
+++ code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseSelecter.cc	2015-04-26 10:29:30 UTC (rev 10397)
@@ -53,7 +53,7 @@
         selectedPos_ = new TDCoordinate(0,0);
 
         Model* selecterModel = new Model(context);
-        selecterModel->setMeshSource("Cube.mesh");
+        selecterModel->setMeshSource("cube.mesh");
         selecterModel->setScale(45);
 
     }

Modified: code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseSelecter.h
===================================================================
--- code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseSelecter.h	2015-04-26 08:24:21 UTC (rev 10396)
+++ code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseSelecter.h	2015-04-26 10:29:30 UTC (rev 10397)
@@ -31,6 +31,7 @@
 
 #include "towerdefense/TowerDefensePrereqs.h"
 #include "worldentities/ControllableEntity.h"
+#include "TDCoordinate.h"
 
 namespace orxonox
 {
@@ -38,7 +39,7 @@
     {
         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);
             virtual void moveFrontBack(const Vector2& value); //!< Overloaded the function to steer the bat up and down.