[Orxonox-commit 4574] r9245 - in code/branches/presentation2012: . data/levels data/levels/includes data/levels/templates src/modules/towerdefense
landauf at orxonox.net
landauf at orxonox.net
Thu May 24 22:07:44 CEST 2012
Author: landauf
Date: 2012-05-24 22:07:43 +0200 (Thu, 24 May 2012)
New Revision: 9245
Modified:
code/branches/presentation2012/
code/branches/presentation2012/data/levels/includes/towerWeaponSettings.oxi
code/branches/presentation2012/data/levels/templates/tower.oxt
code/branches/presentation2012/data/levels/towerDefense.oxw
code/branches/presentation2012/src/modules/towerdefense/Tower.cc
code/branches/presentation2012/src/modules/towerdefense/Tower.h
code/branches/presentation2012/src/modules/towerdefense/TowerDefense.cc
code/branches/presentation2012/src/modules/towerdefense/TowerDefense.h
code/branches/presentation2012/src/modules/towerdefense/TowerDefensePlayerStats.h
Log:
tower defense update (again, now hopefully successful)
Property changes on: code/branches/presentation2012
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/ai:6592-7033
/code/branches/ai2:8721-8880
/code/branches/bigships:8137-8588
/code/branches/buildsystem:1874-2276,2278-2400
/code/branches/buildsystem2:2506-2658
/code/branches/buildsystem3:2662-2708
/code/branches/ceguilua:1802-1808
/code/branches/chat:6527-6797
/code/branches/chat2:6836-6910
/code/branches/console:5941-6104
/code/branches/consolecommands2:6451-7178
/code/branches/consolecommands3:7178-7283
/code/branches/core3:1572-1739
/code/branches/core4:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5:5768-5928,6009
/code/branches/data_cleanup:7537-7686
/code/branches/doc:7290-7400
/code/branches/dockingsystem:8101-8192
/code/branches/dockingsystem2:8196-8560
/code/branches/dynamicmatch:6584-7030
/code/branches/environment3:8887-8975
/code/branches/formation:8885-8991
/code/branches/fps:6591-7072
/code/branches/gamecontent:8893-8968
/code/branches/gameimmersion:8102-8577
/code/branches/gamestate:6430-6572,6621-6661
/code/branches/gamestates2:6594-6745
/code/branches/gametypes:2826-3031
/code/branches/gcc43:1580
/code/branches/gui:1635-1723,2795-2894
/code/branches/hud:8883-8986
/code/branches/hudelements:6584-6941
/code/branches/hudimprovements:7920-8672
/code/branches/ingamemenu:6000-6023
/code/branches/input:1629-1636
/code/branches/ipv6:7293-7458
/code/branches/kicklib:7940-8096,8098-8277
/code/branches/kicklib2:8282-8350
/code/branches/lastmanstanding:7479-7644
/code/branches/lastmanstanding3:7903-8175
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/lod:6586-6911
/code/branches/lodfinal:2372-2411
/code/branches/mac_osx:7789-8128,8135
/code/branches/map:2801-3086,3089
/code/branches/masterserver:7502-7738
/code/branches/masterserverfix:8933-8936
/code/branches/menu:5941-6146,6148,7536-7687
/code/branches/menue:8884-8976
/code/branches/miniprojects:2754-2824
/code/branches/netp2:2835-2988
/code/branches/netp3:2988-3082
/code/branches/netp6:3214-3302
/code/branches/network:2356
/code/branches/network2:6434-6465
/code/branches/network3:7196-7344
/code/branches/network4:7497-7755
/code/branches/network5:7757-7781
/code/branches/network6:7823-8315
/code/branches/network64:2210-2355
/code/branches/newlevel2012:9033-9228
/code/branches/notifications:7314-7401
/code/branches/objecthierarchy:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2:2171-2479
/code/branches/ois_update:7506-7788
/code/branches/output:8739-8857
/code/branches/overlay:2117-2385
/code/branches/particles:2829-3085
/code/branches/particles2:6050-6106,6109
/code/branches/pch:3113-3194
/code/branches/physics:1912-2055,2107-2439
/code/branches/physics_merge:2436-2457
/code/branches/pickup:8145-8555
/code/branches/pickup2:5942-6405
/code/branches/pickup2012:9029-9189
/code/branches/pickup3:6418-6523
/code/branches/pickup4:6594-6710
/code/branches/pickups:1926-2086,2127,2827-2915
/code/branches/pickups2:2107-2497,2915-3071
/code/branches/png2:7262-7263
/code/branches/portals:8087-8455
/code/branches/portals2:8460-8602
/code/branches/ppspickups1:6552-6708
/code/branches/ppspickups2:6527-6532,6554-6709
/code/branches/ppspickups3:6757-6997
/code/branches/ppspickups4:7003-7089
/code/branches/presentation:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2:6106-6416,7787-7800
/code/branches/presentation2011:8974-9015
/code/branches/presentation3:6913-7162
/code/branches/questsystem:1894-2088
/code/branches/questsystem2:2107-2259
/code/branches/questsystem5:2776-2905
/code/branches/releasetodo:7614-7647
/code/branches/resource:3327-3366
/code/branches/resource2:3372-5694
/code/branches/rocket:6523-6950
/code/branches/rocket2:6953-6970
/code/branches/script_trigger:1295-1953,1955
/code/branches/shipSelection:9038-9206
/code/branches/skybox2:6559-6989
/code/branches/sound:2829-3010
/code/branches/sound2012:9205-9214
/code/branches/sound3:5941-6102
/code/branches/spaceboundaries:8085-8457
/code/branches/spaceboundaries2:8460-8613
/code/branches/spacegate:9030-9215
/code/branches/spacerace:8182-8630
/code/branches/spaceraceTwo:8881-8996
/code/branches/steering:5949-6091,8140-8595
/code/branches/surfaceRace:9028-9199
/code/branches/tetris:8100-8563
/code/branches/tutoriallevel:7827-8370
/code/branches/tutoriallevel2:8370-8452
/code/branches/tutoriallevel3:8453-8636
/code/branches/unity_build:8440-8716
/code/branches/usability:7915-8078
/code/branches/weapon:1925-2094
/code/branches/weapon2:2107-2488
/code/branches/weapons:2897-3051,8143-8591
/code/branches/weaponsystem:2742-2890
/code/trunk:9189-9204
+ /code/branches/ai:6592-7033
/code/branches/ai2:8721-8880
/code/branches/bigships:8137-8588
/code/branches/buildsystem:1874-2276,2278-2400
/code/branches/buildsystem2:2506-2658
/code/branches/buildsystem3:2662-2708
/code/branches/ceguilua:1802-1808
/code/branches/chat:6527-6797
/code/branches/chat2:6836-6910
/code/branches/console:5941-6104
/code/branches/consolecommands2:6451-7178
/code/branches/consolecommands3:7178-7283
/code/branches/core3:1572-1739
/code/branches/core4:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5:5768-5928,6009
/code/branches/data_cleanup:7537-7686
/code/branches/doc:7290-7400
/code/branches/dockingsystem:8101-8192
/code/branches/dockingsystem2:8196-8560
/code/branches/dynamicmatch:6584-7030
/code/branches/environment3:8887-8975
/code/branches/formation:8885-8991
/code/branches/fps:6591-7072
/code/branches/gamecontent:8893-8968
/code/branches/gameimmersion:8102-8577
/code/branches/gamestate:6430-6572,6621-6661
/code/branches/gamestates2:6594-6745
/code/branches/gametypes:2826-3031
/code/branches/gcc43:1580
/code/branches/gui:1635-1723,2795-2894
/code/branches/hud:8883-8986
/code/branches/hudelements:6584-6941
/code/branches/hudimprovements:7920-8672
/code/branches/ingamemenu:6000-6023
/code/branches/input:1629-1636
/code/branches/ipv6:7293-7458
/code/branches/kicklib:7940-8096,8098-8277
/code/branches/kicklib2:8282-8350
/code/branches/lastmanstanding:7479-7644
/code/branches/lastmanstanding3:7903-8175
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/lod:6586-6911
/code/branches/lodfinal:2372-2411
/code/branches/mac_osx:7789-8128,8135
/code/branches/map:2801-3086,3089
/code/branches/masterserver:7502-7738
/code/branches/masterserverfix:8933-8936
/code/branches/menu:5941-6146,6148,7536-7687
/code/branches/menue:8884-8976
/code/branches/miniprojects:2754-2824
/code/branches/netp2:2835-2988
/code/branches/netp3:2988-3082
/code/branches/netp6:3214-3302
/code/branches/network:2356
/code/branches/network2:6434-6465
/code/branches/network3:7196-7344
/code/branches/network4:7497-7755
/code/branches/network5:7757-7781
/code/branches/network6:7823-8315
/code/branches/network64:2210-2355
/code/branches/newlevel2012:9033-9244
/code/branches/notifications:7314-7401
/code/branches/objecthierarchy:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2:2171-2479
/code/branches/ois_update:7506-7788
/code/branches/output:8739-8857
/code/branches/overlay:2117-2385
/code/branches/particles:2829-3085
/code/branches/particles2:6050-6106,6109
/code/branches/pch:3113-3194
/code/branches/physics:1912-2055,2107-2439
/code/branches/physics_merge:2436-2457
/code/branches/pickup:8145-8555
/code/branches/pickup2:5942-6405
/code/branches/pickup2012:9029-9189
/code/branches/pickup3:6418-6523
/code/branches/pickup4:6594-6710
/code/branches/pickups:1926-2086,2127,2827-2915
/code/branches/pickups2:2107-2497,2915-3071
/code/branches/png2:7262-7263
/code/branches/portals:8087-8455
/code/branches/portals2:8460-8602
/code/branches/ppspickups1:6552-6708
/code/branches/ppspickups2:6527-6532,6554-6709
/code/branches/ppspickups3:6757-6997
/code/branches/ppspickups4:7003-7089
/code/branches/presentation:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2:6106-6416,7787-7800
/code/branches/presentation2011:8974-9015
/code/branches/presentation3:6913-7162
/code/branches/questsystem:1894-2088
/code/branches/questsystem2:2107-2259
/code/branches/questsystem5:2776-2905
/code/branches/releasetodo:7614-7647
/code/branches/resource:3327-3366
/code/branches/resource2:3372-5694
/code/branches/rocket:6523-6950
/code/branches/rocket2:6953-6970
/code/branches/script_trigger:1295-1953,1955
/code/branches/shipSelection:9038-9206
/code/branches/skybox2:6559-6989
/code/branches/sound:2829-3010
/code/branches/sound2012:9205-9214
/code/branches/sound3:5941-6102
/code/branches/spaceboundaries:8085-8457
/code/branches/spaceboundaries2:8460-8613
/code/branches/spacegate:9030-9215
/code/branches/spacerace:8182-8630
/code/branches/spaceraceTwo:8881-8996
/code/branches/steering:5949-6091,8140-8595
/code/branches/surfaceRace:9028-9199
/code/branches/tetris:8100-8563
/code/branches/tutoriallevel:7827-8370
/code/branches/tutoriallevel2:8370-8452
/code/branches/tutoriallevel3:8453-8636
/code/branches/unity_build:8440-8716
/code/branches/usability:7915-8078
/code/branches/weapon:1925-2094
/code/branches/weapon2:2107-2488
/code/branches/weapons:2897-3051,8143-8591
/code/branches/weaponsystem:2742-2890
/code/trunk:9189-9204
Modified: code/branches/presentation2012/data/levels/includes/towerWeaponSettings.oxi
===================================================================
--- code/branches/presentation2012/data/levels/includes/towerWeaponSettings.oxi 2012-05-24 20:01:01 UTC (rev 9244)
+++ code/branches/presentation2012/data/levels/includes/towerWeaponSettings.oxi 2012-05-24 20:07:43 UTC (rev 9245)
@@ -19,9 +19,9 @@
</links>
<Weapon>
<attached>
- <Model mesh="LightningGun.mesh" pitch="100" roll="90" yaw="90" position="0,-1.3,0" scale=20/>
- <Model mesh="LightningGun-s.mesh" pitch="78" roll="90" yaw="90" position="0.2,-1.3,0" scale=20 />
- <Model mesh="hs-w01_reduced.mesh" roll="45" pitch="-76" yaw="-45" position="-1.5,1,200" scale=20 />
+ <Model mesh="LightningGun.mesh" pitch="100" roll="90" yaw="90" position="0,-1.3,200" scale=1/>
+ <Model mesh="LightningGun-s.mesh" pitch="78" roll="90" yaw="90" position="0.2,-1.3,200" scale=1 />
+ <Model mesh="hs-w01_reduced.mesh" roll="45" pitch="-76" yaw="-45" position="-1.5,1,200" scale=10 />
</attached>
<HsW01 mode=0 munitionpershot=0 delay=0.005 damage=31.4159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
<HsW01 mode=0 munitionpershot=0 delay=0 damage=314.159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
Modified: code/branches/presentation2012/data/levels/templates/tower.oxt
===================================================================
--- code/branches/presentation2012/data/levels/templates/tower.oxt 2012-05-24 20:01:01 UTC (rev 9244)
+++ code/branches/presentation2012/data/levels/templates/tower.oxt 2012-05-24 20:07:43 UTC (rev 9245)
@@ -4,7 +4,7 @@
explosionchunks = 6
- reloadrate = 1
+ reloadrate = 3
reloadwaittime = 1
collisionType = "dynamic"
@@ -12,20 +12,17 @@
>
+ <controller>
+ <WaypointPatrolController alertnessradius=1000 team=5>
+ <waypoints>
+ <Model mesh="cube.mesh" scale=0 position=" 700, 200, 100" />
+ </waypoints>
+ </WaypointPatrolController>
+ </controller>
-
- <controller>
- <WaypointPatrolController alertnessradius=10000 team=5>
- <waypoints>
- <Model mesh="cube.mesh" scale=20 position=" 700, 200, 100" />
- </waypoints>
- </WaypointPatrolController>
- </controller>
-
-
<attached>
- <Model position="0,0,0" scale=45 mesh="Tower.mesh" />
+ <Model position="0,0,0" scale=45 mesh="Tower.mesh" />
</attached>
<!--collisionShapes>
Modified: code/branches/presentation2012/data/levels/towerDefense.oxw
===================================================================
--- code/branches/presentation2012/data/levels/towerDefense.oxw 2012-05-24 20:01:01 UTC (rev 9244)
+++ code/branches/presentation2012/data/levels/towerDefense.oxw 2012-05-24 20:07:43 UTC (rev 9245)
@@ -26,7 +26,7 @@
<Template name=centerpointmarkcamera defaults=0>
<Pawn>
<camerapositions>
- <CameraPosition position="0,0,2000"/>
+ <CameraPosition position="0,0,1500"/>
</camerapositions>
</Pawn>
</Template>
@@ -75,7 +75,7 @@
<!--SpawnPoint team=1 position="0,0,10" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff /-->
<!--SpawnPoint team=0 position="0,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff /-->
- <SpaceShip position="-700,-500, 100" lookat="0,0,0" scale=2 team=1 >
+ <SpaceShip position="-700,-500, 100" lookat="0,0,0" scale=3 team=1 >
<templates>
<Template link=spaceshipassff />
</templates>
@@ -83,10 +83,11 @@
<WaypointController accuracy=60>
<waypoints>
<!-- 1,3 10,3 10,11, 13,11 -->
- <Model mesh="cube.mesh" scale=20 position="-700,-500, 100" />
- <Model mesh="cube.mesh" scale=20 position=" 200,-500, 100" />
- <Model mesh="cube.mesh" scale=20 position=" 200, 300, 100" />
- <Model mesh="cube.mesh" scale=20 position=" 500, 300, 100" />
+ <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" />
</waypoints>
</WaypointController>
</controller>
@@ -98,6 +99,8 @@
<attached>
<Model position="-50,-50,0" mesh="Playfield_ME.mesh" scale=80 />
+ <!-- Base -->
+ <Model position="500,700,100" mesh="sphere.mesh" scale=80 />
<!--Model position="0,0,0" mesh="crate.mesh" scale3D="3,3,3" /--> <!-- Only temporary needed to help align the collisionshape -->
<!-- This was used to mark the playfield, let's let it be here for now -->
<!--Model position="-8,8,0" mesh="crate.mesh" scale3D="0.3,0.3,0.3" /-->
Modified: code/branches/presentation2012/src/modules/towerdefense/Tower.cc
===================================================================
--- code/branches/presentation2012/src/modules/towerdefense/Tower.cc 2012-05-24 20:01:01 UTC (rev 9244)
+++ code/branches/presentation2012/src/modules/towerdefense/Tower.cc 2012-05-24 20:07:43 UTC (rev 9245)
@@ -21,7 +21,7 @@
@brief
Constructor. Registers and initializes the object.
*/
- Tower::Tower(BaseObject* creator) : SpaceShip(creator)
+ Tower::Tower(BaseObject* creator) : Pawn(creator)
{
RegisterObject(Tower);
@@ -35,6 +35,31 @@
this->delayTimer_.setTimer(0.2f, false, createExecutor(createFunctor(&TetrisStone::enableMovement, this)));
*/
}
+
+ void Tower::setOrientation(const Quaternion& orientation)
+ {
+ static int ori;
+ orxout() << "orientation " << ++ori << endl;
+ }
+
+ void Tower::rotateYaw(const Vector2& value)
+ {
+ static int yaw;
+ orxout() << "rotateYaw " << ++yaw << endl;
+ }
+
+ void Tower::rotatePitch(const Vector2& value)
+ {
+ static int pitch;
+ orxout() << "rotatePitch " << ++pitch << endl;
+ }
+
+ void Tower::rotateRoll(const Vector2& value)
+ {
+ static int roll;
+ orxout() << "rotateRoll" << ++roll << endl;
+ }
+
// This function is called whenever a player presses the up or the down key.
// You have to implement what happens when the up or the down key is pressed.
// value.x < 0 means: down key is pressed.
@@ -54,10 +79,12 @@
@param value
A vector whose first component is the angle by which to rotate.
*/
+ /*
void Tower::moveFrontBack(const Vector2& value)
{
//orxout() << "frontBack.x: " << value.x << endl;
}
+ */
/**
@brief
@@ -65,10 +92,11 @@
@param value
A vector whose first component is the direction in which we want to steer the stone.
*/
+ /*
void Tower::moveRightLeft(const Vector2& value)
{
//orxout() << "rightLeft.x: " << value.x << endl;
- /*
+
if(!this->delay_)
{
const Vector3& position = this->getPosition();
@@ -79,7 +107,7 @@
this->setPosition(newPos);
this->delay_ = true;
this->delayTimer_.startTimer();
- }
- */
+ }
}
+ */
}
Modified: code/branches/presentation2012/src/modules/towerdefense/Tower.h
===================================================================
--- code/branches/presentation2012/src/modules/towerdefense/Tower.h 2012-05-24 20:01:01 UTC (rev 9244)
+++ code/branches/presentation2012/src/modules/towerdefense/Tower.h 2012-05-24 20:07:43 UTC (rev 9245)
@@ -19,18 +19,28 @@
#include "towerdefense/TowerDefensePrereqs.h"
#include "worldentities/pawns/SpaceShip.h"
+
namespace orxonox
{
- class _OrxonoxExport Tower : public SpaceShip
+ class _OrxonoxExport Tower : public Pawn
{
public:
Tower(BaseObject* creator);
virtual ~Tower() {};
+ // Maybe later override these to move towers with cursor keys
+ /*
virtual void moveFrontBack(const Vector2& value);
virtual void moveRightLeft(const Vector2& value);
+ */
+ // Overriding these to stop towers from spasing out
+ void setOrientation(const Quaternion& orientation);
+ virtual void rotateYaw(const Vector2& value);
+ virtual void rotatePitch(const Vector2& value);
+ virtual void rotateRoll(const Vector2& value);
+
void setGame(TowerDefense* towerdefense)
{ assert(towerdefense); game_ = towerdefense; }
private:
Modified: code/branches/presentation2012/src/modules/towerdefense/TowerDefense.cc
===================================================================
--- code/branches/presentation2012/src/modules/towerdefense/TowerDefense.cc 2012-05-24 20:01:01 UTC (rev 9244)
+++ code/branches/presentation2012/src/modules/towerdefense/TowerDefense.cc 2012-05-24 20:07:43 UTC (rev 9245)
@@ -104,9 +104,6 @@
/* 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) ) );
}
TowerDefense::~TowerDefense()
@@ -130,21 +127,18 @@
{
Deathmatch::start();
- orxout() << "Adding towers for debug..." << endl;
+ const int kInitialTowerCount = 3;
+ Coordinate initialTowerCoordinates[kInitialTowerCount] = {{3,2}, {8,5}, {12,10}};
- // Mark corners
- addTower(0,15); addTower(15,0);
+ for (int i = 0; i < kInitialTowerCount; i++)
+ {
+ Coordinate coordinate = initialTowerCoordinates[i];
+ addTower(coordinate.x, coordinate.y);
+ }
- // Mark diagonal line
- for (int i = 0 ; i <= 15; i++)
- addTower(i,i);
-
- orxout() << "Done" << endl;
-
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
-
}
void TowerDefense::end()
@@ -197,14 +191,8 @@
Tower* newTower = new Tower(this->center_);
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
}
bool TowerDefense::hasEnoughCreditForTower(TowerCost towerCost)
@@ -228,27 +216,12 @@
void TowerDefense::tick(float dt)
{
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();
-
- }
}
// Function to test if we can add waypoints using code only. Doesn't work yet
// 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()
{
SpaceShip *newShip = new SpaceShip(this->center_);
@@ -282,7 +255,7 @@
// this->center_->attach(newShip);
}
-
+ */
/*
void TowerDefense::playerEntered(PlayerInfo* player)
{
Modified: code/branches/presentation2012/src/modules/towerdefense/TowerDefense.h
===================================================================
--- code/branches/presentation2012/src/modules/towerdefense/TowerDefense.h 2012-05-24 20:01:01 UTC (rev 9244)
+++ code/branches/presentation2012/src/modules/towerdefense/TowerDefense.h 2012-05-24 20:07:43 UTC (rev 9245)
@@ -77,7 +77,6 @@
private:
-// WeakPtr<TowerDefenseCenterpoint> center_;
TowerDefenseCenterpoint *center_;
/* handles stats */
@@ -91,12 +90,8 @@
int y;
} Coordinate;
-
-
std::vector<Coordinate> addedTowersCoordinates_;
std::vector<Tower*> towers_;
-
- void addWaypointsAndFirstEnemy();
};
}
Modified: code/branches/presentation2012/src/modules/towerdefense/TowerDefensePlayerStats.h
===================================================================
--- code/branches/presentation2012/src/modules/towerdefense/TowerDefensePlayerStats.h 2012-05-24 20:01:01 UTC (rev 9244)
+++ code/branches/presentation2012/src/modules/towerdefense/TowerDefensePlayerStats.h 2012-05-24 20:07:43 UTC (rev 9245)
@@ -42,7 +42,8 @@
namespace orxonox
{
typedef enum _TowerCosts {
- TDDefaultTowerCost = 200
+ // Set to 0 for debug...
+ TDDefaultTowerCost = 0
} TowerCost;
class _TowerDefenseExport TowerDefensePlayerStats
More information about the Orxonox-commit
mailing list