Changeset 9236 for code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc

Timestamp:

May 24, 2012, 10:00:06 AM (12 years ago)

Author:

mentzerf

Message:

• Changed waypoint scale so that they are not visible anymore
• Changed gun position
• Changed Tower to be a Pawn subclass
• Fixed glitches of Tower by overriding the orientation and rotation functions

+ Now spawning a few towers in -start

• Clean up

File:

• code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc (modified) (6 diffs)

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

@@ -105 +105 @@
                 /* Temporary hack to allow the player to add towers */
                 this->dedicatedAddTower_ = createConsoleCommand( "addTower", createExecutor( createFunctor(&TowerDefense::addTower, this) ) );
-        
-                // Quick hack to test waypoints
-                createConsoleCommand( "aw", createExecutor( createFunctor(&TowerDefense::addWaypointsAndFirstEnemy, this) ) );
     }
         
@@ -131 +128 @@
         Deathmatch::start();
                 
-        orxout() << "Adding towers for debug..." << endl;
-                
-                // Mark corners
-                addTower(0,15); addTower(15,0);
-                
-                // Mark diagonal line
-                for (int i = 0 ; i <= 15; i++)
-                        addTower(i,i);
-                
-                orxout() << "Done" << endl;
+                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);
+                }
                 
                 ChatManager::message("Use the console command addTower x y to add towers");
 
                 //TODO: let the player control his controllable entity && TODO: create a new ControllableEntity for the player
-
         }
         
@@ -198 +192 @@
                 newTower->addTemplate(this->center_->getTowerTemplate());
 
-                //this->center_->attach(newTower);
-
-                newTower->setPosition((x-8) * tileScale, (y-8) * tileScale, 100);
+                newTower->setPosition((x-8) * tileScale, (y-8) * tileScale, 75);
                 newTower->setGame(this);
-                //TODO: Save the Tower in a Vector. I would suggest std::vector< std::vector<Tower*> > towers_ as a protected member variable;
-                
-                // TODO: create Tower mesh
-                // TODO: load Tower mesh
         }
         
@@ -229 +217 @@
     {
         SUPER(TowerDefense, tick, dt);
-                
-        static int test = 0;
-        if (++test == 10)
-        {
-                        orxout()<< "10th tick." <<endl;
-                        /*
-                        for (std::set<SpawnPoint*>::iterator it = this->spawnpoints_.begin(); it != this->spawnpoints_.end(); it++)
-                        {
-                                orxout() << "checking spawnpoint with name " << (*it)->getSpawnClass()->getName() << endl;
-                        }
-                        */
-                        
-                        //addWaypointsAndFirstEnemy();
-                        
-        }
     }
         
@@ -249 +222 @@
         
         // THE PROBLEM: WaypointController's getControllableEntity() returns null, so it won't track. How do we get the controlableEntity to NOT BE NULL???
-        
+        /*
         void TowerDefense::addWaypointsAndFirstEnemy()
         {
@@ -283 +256 @@
 //              this->center_->attach(newShip);
         }
-        
+        */
         /*
          void TowerDefense::playerEntered(PlayerInfo* player)