Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10319


Ignore:
Timestamp:
Mar 19, 2015, 1:31:54 PM (9 years ago)
Author:
erbj
Message:

tower now inherits from turret

Location:
code/branches/towerdefenseFS15/src/modules/towerdefense
Files:
4 deleted
4 edited

Legend:

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

    r10258 r10319  
    22  TowerDefense.cc
    33  TowerDefenseTower.cc
    4   TowerTurret.cc
    54  TowerDefenseCenterpoint.cc
    65  TowerDefenseHUDController.cc
     
    1716    orxonox
    1817    overlays
     18    objects
    1919  SOURCE_FILES ${TOWERDEFENSE_SRC_FILES}
    2020)
  • code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc

    r10258 r10319  
    7777#include "TowerDefenseCenterpoint.h"
    7878//#include "TDCoordinate.h"
    79 #include "TowerTurret.h"
    8079#include "worldentities/SpawnPoint.h"
    8180#include "worldentities/pawns/Pawn.h"
     
    141140        }
    142141
     142        //the path of the spacehips has to be blocked, so that no towers can be build there
    143143        for (int k=0; k<3; k++)
    144144            towermatrix[1][k]=true;
     
    153153
    154154        //set initial credits, lifes and WaveNumber
    155         this->setCredit(200);
     155        this->setCredit(1000);
    156156        this->setLifes(50);
    157157        this->setWaveNumber(0);
     
    159159
    160160        //adds initial towers
     161        /*
    161162        for (int i=0; i <7; i++){
    162163            addTower(i+3,4);
    163         }/*
    164         for (int j=0; j < 7; j++){
    165             addTower(9,j+5);
    166         }*/
     164        }
     165        */
    167166    }
    168167
  • code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.cc

    r10258 r10319  
    2222        Constructor. Registers and initializes the object.
    2323    */
    24     TowerDefenseTower::TowerDefenseTower(Context* context) : Pawn(context)
     24    TowerDefenseTower::TowerDefenseTower(Context* context) : Turret(context)
    2525    {
    2626        RegisterObject(TowerDefenseTower);
    27 
     27        game_ =NULL;
    2828        this->setCollisionType(WorldEntity::Dynamic);
    2929        upgrade = 0;
     30
     31
     32
    3033
    3134        //this->removeAllEngines();
  • code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.h

    r10258 r10319  
    2020#include "towerdefense/TowerDefensePrereqs.h"
    2121#include "worldentities/pawns/SpaceShip.h"
     22#include "objects/Turret.h"
    2223
    2324
    2425namespace orxonox
    2526{
    26     class _TowerDefenseExport TowerDefenseTower : public Pawn
     27    class _TowerDefenseExport TowerDefenseTower : public Turret
    2728    {
    2829    public:
Note: See TracChangeset for help on using the changeset viewer.