[Orxonox-commit 5461] r10124 - code/branches/surfaceraceHS14/src/modules/dodgerace2
sriedel at orxonox.net
sriedel at orxonox.net
Wed Nov 12 16:11:00 CET 2014
Author: sriedel
Date: 2014-11-12 16:11:00 +0100 (Wed, 12 Nov 2014)
New Revision: 10124
Modified:
code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc
code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h
code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.cc
code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.h
code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc
code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.h
Log:
still working atm. including function after function, currently HUD.
Modified: code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc
===================================================================
--- code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc 2014-11-12 15:09:35 UTC (rev 10123)
+++ code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc 2014-11-12 15:11:00 UTC (rev 10124)
@@ -66,7 +66,7 @@
void DodgeRace::levelUp()
{
level++;
- /* if (getPlayer() != NULL)
+ if (getPlayer() != NULL)
{
for (int i = 0; i < 7; i++)
{
@@ -75,7 +75,7 @@
chunk->setVelocity(Vector3(1000, 0, 0)); //player->getVelocity()
chunk->setScale(20);
}
- }*/
+ }
addPoints(multiplier * 42);
multiplier *= 2;
toggleShowLevel();
@@ -118,7 +118,7 @@
newPawn->setPosition(player->getPosition() + Vector3(500.f + 100 * i, 0, float(rand())/RAND_MAX * 400 - 200));
}
}
-
+*/
void DodgeRace::costLife()
{
lives--;
@@ -127,7 +127,7 @@
// if (lives <= 0)
// enemySpawnTimer.setTimer(30.0f, false, createExecutor(createFunctor(&DodgeRace::end, this)));
};
-*/
+
void DodgeRace::comboControll()
{
if (b_combo)
@@ -144,12 +144,12 @@
// Set variable to temporarily force the player to spawn.
this->bForceSpawn_ = true;
- /*if (this->center_ == NULL) // abandon mission!
+ if (this->center_ == NULL) // abandon mission!
{
orxout(internal_error) << "DodgeRace: No Centerpoint specified." << endl;
GSLevel::startMainMenu();
return;
- }*/
+ }
// Call start for the parent class.
Deathmatch::start();
}
@@ -161,7 +161,7 @@
b_combo = true;
}
}
-/*
+
void DodgeRace::end()
{
// DON'T CALL THIS!
@@ -169,5 +169,5 @@
// It will misteriously crash the game!
// Instead startMainMenu, this won't crash.
GSLevel::startMainMenu();
- }*/
+ }
}
Modified: code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h
===================================================================
--- code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h 2014-11-12 15:09:35 UTC (rev 10123)
+++ code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h 2014-11-12 15:11:00 UTC (rev 10124)
@@ -38,7 +38,7 @@
#include "dodgerace2/DodgeRacePrereqs.h"
#include "DodgeRaceCenterPoint.h" // Necessary for WeakPointer??
-//#include "DodgeRaceShip.h" // DO NOT include in Header. Will cause forward declaration issues
+//#include "DodgeRaceShip.h" DO NOT include in Header. Will cause forward declaration issues
//#include "DodgeRaceHUDinfo.h"
@@ -71,7 +71,7 @@
void init();
virtual void start();
- //virtual void end();
+ virtual void end();
void levelUp();
@@ -82,9 +82,11 @@
void setCenterpoint(DodgeRaceCenterPoint* center)
{ this->center_ = center; }
+ virtual void addBots(unsigned int amount){} //<! overwrite function in order to bypass the addbots command
// checks if multiplier should be reset.
void comboControll();
+ void costLife();
bool bEndGame;
bool bShowLevel;
@@ -107,7 +109,7 @@
Timer showLevelTimer;
- /* virtual void addBots(unsigned int amount){} //<! overwrite function in order to bypass the addbots command
+ /*
//void spawnEnemy();
@@ -115,13 +117,13 @@
- void costLife();
+
private:
Modified: code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.cc
===================================================================
--- code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.cc 2014-11-12 15:09:35 UTC (rev 10123)
+++ code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.cc 2014-11-12 15:11:00 UTC (rev 10124)
@@ -38,12 +38,12 @@
DodgeRaceHUDinfo::DodgeRaceHUDinfo(Context* context) : OverlayText(context)
{
RegisterObject(DodgeRaceHUDinfo);
-/*
+
this->DodgeRaceGame = 0;
this->bShowLives_ = false;
this->bShowLevel_ = false;
this->bShowPoints_ = false;
- this->bShowMultiplier_ = false;*/
+ this->bShowMultiplier_ = false;
}
/*
void DodgeRaceHUDinfo::XMLPort(Element& xmlelement, XMLPort::Mode mode)
Modified: code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.h
===================================================================
--- code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.h 2014-11-12 15:09:35 UTC (rev 10123)
+++ code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.h 2014-11-12 15:11:00 UTC (rev 10124)
@@ -42,11 +42,11 @@
{
public:
DodgeRaceHUDinfo(Context* context);
- /*
- virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void changedOwner();
+ // virtual void tick(float dt);
+ // virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ //virtual void changedOwner();
+
inline void setShowLives(bool value)
{ this->bShowLives_ = value; }
inline bool getShowLives() const
@@ -73,7 +73,7 @@
bool bShowLives_;
bool bShowLevel_;
bool bShowPoints_;
- bool bShowMultiplier_;*/
+ bool bShowMultiplier_;
};
}
#endif /* _DodgeRaceHUDinfo_H__ */
Modified: code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc
===================================================================
--- code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc 2014-11-12 15:09:35 UTC (rev 10123)
+++ code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc 2014-11-12 15:11:00 UTC (rev 10124)
@@ -45,6 +45,7 @@
isFireing = false;
damping = 10;
+ // not sure if has to be zero?
lastTimeFront = 0;
lastTimeLeft = 0;
lastTime = 0;
@@ -105,14 +106,14 @@
setPosition(pos);
setOrientation(Vector3::UNIT_Y, Degree(270));
-/*
+
// Level up!
if (pos.x > 42000)
{
updateLevel();
setPosition(Vector3(0, 0, pos.z)); // pos - Vector3(30000, 0, 0)
}
-*/
+
SUPER(DodgeRaceShip, tick, dt);
}
@@ -182,10 +183,10 @@
}
return game;
}
-/*
+
void DodgeRaceShip::death()
{
getGame()->costLife();
SpaceShip::death();
- }*/
+ }
}
Modified: code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.h
===================================================================
--- code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.h 2014-11-12 15:09:35 UTC (rev 10123)
+++ code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.h 2014-11-12 15:11:00 UTC (rev 10124)
@@ -74,9 +74,13 @@
float speed, damping, posforeward;
bool isFireing;
+ protected:
+ virtual void death();
+
private:
WeakPtr<DodgeRace> getGame();
WeakPtr<DodgeRace> game;
+ WeakPtr<Projectile> lastShot;
Camera* camera;
float lastTimeFront, lastTimeLeft, lastTime;
struct Velocity
@@ -89,24 +93,13 @@
/*
+ virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
-
- //virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
-
- protected:
- virtual void death();
-
private:
+ WeakPtr<DodgeRaceEnemy> lastEnemy;
+ */
-
-
-
-
-
- // WeakPtr<DodgeRaceEnemy> lastEnemy;
- WeakPtr<Projectile> lastShot;*/
-
};
}
More information about the Orxonox-commit
mailing list