Changeset 10105

Timestamp:

Nov 3, 2014, 4:33:54 PM (9 years ago)

Author:

erbj

Message:

Added TDCoordinate and more updates

Location:

code/branches/towerdefenseHS14

Files:

• data/levels/towerDefense.oxw (modified) (1 diff)
• src/modules/towerdefense/CMakeLists.txt (modified) (1 diff)
• src/modules/towerdefense/Enemy.cc (added)
• src/modules/towerdefense/Enemy.h (added)
• src/modules/towerdefense/TDCoordinate.cc (added)
• src/modules/towerdefense/TDCoordinate.h (added)
• src/modules/towerdefense/TowerDefense.cc (modified) (6 diffs)
• src/modules/towerdefense/TowerDefense.h (modified) (3 diffs)

code/branches/towerdefenseHS14/data/levels/towerDefense.oxw

@@ -84 +84 @@
           <waypoints>
             <!-- 1,3 10,3 10,11, 13,11 -->
-            <Model mesh="cube.mesh" scale=0 position="-700,-500, 150" />
-            <Model mesh="cube.mesh" scale=0 position=" 200,-500, 150" />
-            <Model mesh="cube.mesh" scale=0 position=" 200, 300, 150" />
-            <Model mesh="cube.mesh" scale=0 position=" 500, 300, 150" />
-            <Model mesh="cube.mesh" scale=0 position=" 500, 700, 150" />
+            <Model mesh="cube.mesh" scale=10 position="-700,-500, 150" />
+            <Model mesh="cube.mesh" scale=10 position=" 200,-500, 150" />
+            <Model mesh="cube.mesh" scale=10 position=" 200, 300, 150" />
+            <Model mesh="cube.mesh" scale=10 position=" 500, 300, 150" />
+            <Model mesh="cube.mesh" scale=10 position=" 500, 700, 150" />
           </waypoints>
         </WaypointController>

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

@@ -5 +5 @@
   TowerDefenseHUDController.cc
   TowerDefensePlayerStats.cc
-  TowerTurret.cc
+  TDCoordinate.cc
+  Enemy.cc
+
 )
 

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

@@ -78 +78 @@
 #include "TowerTurret.h"
 #include "TowerDefenseCenterpoint.h"
-
+//#include "TDCoordinate.h"
 #include "worldentities/SpawnPoint.h"
 #include "worldentities/pawns/Pawn.h"
@@ -131 +131 @@
 
         const int kInitialTowerCount = 3;
-        Coordinate initialTowerCoordinates[kInitialTowerCount] = {{3,2}, {8,5}, {12,10}};
 
         for (int i = 0; i < kInitialTowerCount; i++)
         {
-            Coordinate coordinate = initialTowerCoordinates[i];
-            addTower(coordinate.x, coordinate.y);
+                //{{3,2}, {8,5}, {12,10}}; old coordinates
+            TDCoordinate* coordinate = new TDCoordinate(i,(i*2));
+            addTower(coordinate->x, coordinate->y);
         }
 
@@ -144 +144 @@
     }
 
+    void TowerDefense::addEnemy(){}
+
+
     void TowerDefense::end()
     {
@@ -150 +153 @@
         ChatManager::message("Match is over");
     }
+
+
 
     void TowerDefense::addTower(int x, int y)
@@ -184 +189 @@
 
         // Add tower to coordinatesStack
-        Coordinate newTowerCoordinates = {x, y};
+        TDCoordinate newTowerCoordinates;
+        newTowerCoordinates.x=x;
+        newTowerCoordinates.y=y;
+
+
         addedTowersCoordinates_.push_back(newTowerCoordinates);
 
@@ -205 +214 @@
     bool TowerDefense::towerExists(int x, int y)
     {
-        for(std::vector<Coordinate>::iterator it = addedTowersCoordinates_.begin(); it != addedTowersCoordinates_.end(); ++it)
-        {
-            Coordinate currentCoordinates = (Coordinate) (*it);
+        for(std::vector<TDCoordinate>::iterator it = addedTowersCoordinates_.begin(); it != addedTowersCoordinates_.end(); ++it)
+        {
+            TDCoordinate currentCoordinates = (TDCoordinate) (*it);
             if (currentCoordinates.x == x && currentCoordinates.y == y)
                 return true;

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

@@ -37 +37 @@
 #ifndef _TowerDefense_H__
 #define _TowerDefense_H__
-
+#include "TDCoordinate.h"
 #include "towerdefense/TowerDefensePrereqs.h"
 #include "gametypes/Deathmatch.h"
@@ -51 +51 @@
         virtual ~TowerDefense();
 
+        void addEnemy();
         virtual void start(); //<! The function is called when the gametype starts
         virtual void end();
@@ -86 +87 @@
         bool towerExists(int x, int y);
 
-        typedef struct {
-            int x;
-            int y;
-        } Coordinate;
 
-        std::vector<Coordinate> addedTowersCoordinates_;
+        std::vector<TDCoordinate> addedTowersCoordinates_;
         std::vector<TowerTurret*> towers_;
     };