Changeset 10106

Timestamp:

Nov 4, 2014, 8:04:19 AM (9 years ago)

Author:

smerkli

Message:

Fixed the list problem, it was a circular include.

Location:

code/branches/towerdefenseHS14/src/modules/towerdefense

Files:

• CMakeLists.txt (modified) (1 diff)
• Enemy.cc (modified) (1 diff)
• TDCoordinate.cc (modified) (3 diffs)
• TDCoordinate.h (modified) (2 diffs)

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

@@ -2 +2 @@
   TowerDefense.cc
   Tower.cc
+  TowerTurret.cc
   TowerDefenseCenterpoint.cc
   TowerDefenseHUDController.cc

code/branches/towerdefenseHS14/src/modules/towerdefense/Enemy.cc

@@ -46 +46 @@
     {
         if(Waypointsvector_.size()<=0){
-                TDCoordinate coord = {-1,-1};
+                TDCoordinate coord = TDCoordinate(-1,-1);
                 return coord;
         }else{

code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.cc

@@ -8 +8 @@
 namespace orxonox
 {
-    RegisterClass(TDCoordinate);
+    //RegisterClass(TDCoordinate);
 
     /**
@@ -16 +16 @@
     TDCoordinate::TDCoordinate()
     {
-        RegisterObject(TDCoordinate);
+        //RegisterObject(TDCoordinate);
         x=0;
         y=0;
@@ -33 +33 @@
         int tileScale = 100;
 
-        Vector3 coord = new Vector3();
-        coord.x= (x-8) * tileScale;
-        coord.y= (y-8) * tileScale;
-        coord.z=0;
+        Vector3 *coord = new Vector3();
+        coord->x= (x-8) * tileScale;
+        coord->y= (y-8) * tileScale;
+        coord->z=0;
 
-        return coord;
+        return *coord;
     }
 }

code/branches/towerdefenseHS14/src/modules/towerdefense/TDCoordinate.h

@@ -4 +4 @@
 #include "core/CoreIncludes.h"
 #include "TDCoordinate.h"
-#include "towerdefense/TowerDefense.h"
+//#include "towerdefense/TowerDefense.h"
 #include "gametypes/Deathmatch.h"
 #include "towerdefense/TowerDefensePrereqs.h"
@@ -13 +13 @@
 //Class to save the Coordinates in a class instead of struct
 //Convert 2d coordinates to 3d in order to set waypoints
-class _TowerDefenseExport TDCoordinate: public Pawn {
+class _TowerDefenseExport TDCoordinate: public OrxonoxClass {
 public:
                         int x;