Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10397 for code


Ignore:
Timestamp:
Apr 26, 2015, 12:29:30 PM (9 years ago)
Author:
fvultier
Message:

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

Location:
code/branches/towerdefenseFS15/src/modules/towerdefense
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • code/branches/towerdefenseFS15/src/modules/towerdefense/CMakeLists.txt

    r10368 r10397  
    77  TDCoordinate.cc
    88  TowerDefenseEnemy.cc
    9  # TowerDefenseSelecter.cc
    10 
     9  TowerDefenseSelecter.cc
    1110)
    1211
  • code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc

    r10388 r10397  
    109109        }*/
    110110
    111         this->Selecter = new TowerDefenseSelecter(context);
     111        selecter = NULL;
    112112
    113113
     
    149149
    150150// Waypoints: [1,3] [10,3] [10,11] [13,11] -> add the points to a matrix so the player cant place towers on the path
    151         for (int i=0; i < 16 ; i++){
    152             for (int j = 0; j< 16 ; j++){
     151        for (int i=0; i < 16 ; i++)
     152        {
     153            for (int j = 0; j< 16 ; j++)
     154            {
    153155                towerModelMatrix[i][j] = NULL;
    154156                towerTurretMatrix[i][j] = NULL;
    155157            }
    156158        }
     159
     160        selecter = new TowerDefenseSelecter(this->center_->getContext());
    157161
    158162        Model* dummyModel = new Model(this->center_->getContext());
  • code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.h

    r10388 r10397  
    3838#define _TowerDefense_H__
    3939#include "TDCoordinate.h"
     40#include "TowerDefenseSelecter.h"
    4041#include "towerdefense/TowerDefensePrereqs.h"
    4142#include "gametypes/TeamDeathmatch.h"
     
    7576        int reduceLifes(int NumberofLifes){ return lifes_-=NumberofLifes; }
    7677        TDCoordinate* selectedPos;
    77         TowerDefenseSelecter* Selecter;
     78        TowerDefenseSelecter* selecter;
    7879
    7980        //virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
  • code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseSelecter.cc

    r10394 r10397  
    5454
    5555        Model* selecterModel = new Model(context);
    56         selecterModel->setMeshSource("Cube.mesh");
     56        selecterModel->setMeshSource("cube.mesh");
    5757        selecterModel->setScale(45);
    5858
  • code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseSelecter.h

    r10394 r10397  
    3232#include "towerdefense/TowerDefensePrereqs.h"
    3333#include "worldentities/ControllableEntity.h"
     34#include "TDCoordinate.h"
    3435
    3536namespace orxonox
     
    3940        public:
    4041            TowerDefenseSelecter(Context* context); //!< Constructor. Registers and initializes the object.
    41             virtual ~TowerDefenseSelecter() {}
     42            virtual ~TowerDefenseSelecter();
    4243            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    4344            virtual void tick(float dt);
Note: See TracChangeset for help on using the changeset viewer.