[Orxonox-commit 443] r3020 - in branches/gametypes/src/orxonox: . objects/gametypes objects/worldentities objects/worldentities/pawns objects/worldentities/triggers overlays/hud
landauf at orxonox.net
landauf at orxonox.net
Sat May 23 19:04:10 CEST 2009
Author: landauf
Date: 2009-05-23 19:04:10 +0200 (Sat, 23 May 2009)
New Revision: 3020
Modified:
branches/gametypes/src/orxonox/OrxonoxPrereqs.h
branches/gametypes/src/orxonox/objects/gametypes/Asteroids.cc
branches/gametypes/src/orxonox/objects/gametypes/Asteroids.h
branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.cc
branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.h
branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.cc
branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.h
branches/gametypes/src/orxonox/objects/worldentities/ForceField.cc
branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.cc
branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.h
branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc
branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h
branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.cc
branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.h
branches/gametypes/src/orxonox/overlays/hud/HUDTimer.cc
branches/gametypes/src/orxonox/overlays/hud/HUDTimer.h
Log:
some small adjustments in all the new gametype classes
Modified: branches/gametypes/src/orxonox/OrxonoxPrereqs.h
===================================================================
--- branches/gametypes/src/orxonox/OrxonoxPrereqs.h 2009-05-23 16:24:32 UTC (rev 3019)
+++ branches/gametypes/src/orxonox/OrxonoxPrereqs.h 2009-05-23 17:04:10 UTC (rev 3020)
@@ -138,6 +138,7 @@
class ControllableEntity;
class MovableEntity;
class Sublevel;
+ class ForceField;
class Model;
class Billboard;
@@ -162,6 +163,8 @@
class Spectator;
class Pawn;
class SpaceShip;
+ class TeamBaseMatchBase;
+ class Destroyer;
class Item;
class Engine;
@@ -172,6 +175,7 @@
class DistanceTrigger;
class EventTrigger;
class PlayerTrigger;
+ class CheckPoint;
class WeaponSystem;
class WeaponSet;
@@ -201,6 +205,9 @@
class Gametype;
class Deathmatch;
class TeamDeathmatch;
+ class Asteroids;
+ class TeamBaseMatch;
+ class UnderAttack;
class Pong;
class Scores;
@@ -233,6 +240,7 @@
class HUDRadar;
class HUDSpeedBar;
class HUDHealthBar;
+ class HUDTimer;
class InGameConsole;
class Notification;
class NotificationManager;
Modified: branches/gametypes/src/orxonox/objects/gametypes/Asteroids.cc
===================================================================
--- branches/gametypes/src/orxonox/objects/gametypes/Asteroids.cc 2009-05-23 16:24:32 UTC (rev 3019)
+++ branches/gametypes/src/orxonox/objects/gametypes/Asteroids.cc 2009-05-23 17:04:10 UTC (rev 3020)
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Author:
- * Aurelian
+ * Aurelian Jaggi
* Co-authors:
* ...
*
@@ -49,7 +49,7 @@
void Asteroids::tick(float dt)
{
SUPER(Asteroids, tick, dt);
-
+
if (firstCheckpointReached_ && !this->timerIsActive_)
{
this->startTimer();
Modified: branches/gametypes/src/orxonox/objects/gametypes/Asteroids.h
===================================================================
--- branches/gametypes/src/orxonox/objects/gametypes/Asteroids.h 2009-05-23 16:24:32 UTC (rev 3019)
+++ branches/gametypes/src/orxonox/objects/gametypes/Asteroids.h 2009-05-23 17:04:10 UTC (rev 3020)
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Author:
- * Aurelian
+ * Aurelian Jaggi
* Co-authors:
* ...
*
@@ -45,7 +45,7 @@
virtual void start();
virtual void end();
-
+
inline void firstCheckpointReached(bool reached)
{ this->firstCheckpointReached_ = reached; }
Modified: branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.cc
===================================================================
--- branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.cc 2009-05-23 16:24:32 UTC (rev 3019)
+++ branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.cc 2009-05-23 17:04:10 UTC (rev 3020)
@@ -19,25 +19,22 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * Author: Val Mikos
+ * Author:
+ * Val Mikos
+ * Co-authors:
+ * ...
+ *
*/
-
-
#include "TeamBaseMatch.h"
-
-#include "objects/worldentities/pawns/TeamBaseMatchBase.h"
+#include "objects/worldentities/pawns/TeamBaseMatchBase.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
-
namespace orxonox
{
CreateUnloadableFactory(TeamBaseMatch);
-
- // Timer and Creator
TeamBaseMatch::TeamBaseMatch(BaseObject* creator) : TeamDeathmatch(creator)
{
RegisterObject(TeamBaseMatch);
@@ -48,32 +45,7 @@
this->pointsTeam1_ = 0;
this->pointsTeam2_ = 0;
}
-
-
- // set the Bases positions using XML
- void TeamBaseMatch::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(TeamBaseMatch, XMLPort, xmlelement, mode);
-// XMLPortObject(TeamBaseMatch, WorldEntity, setNeutralshape, getNeturalshape, xmlelement, mode);
-// XMLPortObject(TeamBaseMatch, WorldEntity, setTeam1shape, getTeam1shape, xmlelement, mode);
-// XMLPortObject(TeamBaseMatch, WorldEntity, setTeam2shape, getTeam2shape, xmlelement, mode);
-
-// XMLPortObject(TeamBaseMatch, TeamBaseMatchBase, addBase, getBase, xmlelement, mode);
- }
-
-/*
- // pretty useless at the moment...should be implemented in the TeamBaseMatchBase class headerfile
- // State of the Base (controlled, uncontrolled)
- int TeamBaseMatch::baseState(Base)
- {
- if(Enum state_==uncontrolled) return 0;
- if(Enum state_==controlTeam1) return 1;
- if(Enum state_==controlTeam2) return 2;
- }
-*/
-
-
// Change the control of the defeated base and respawn it with its initial health
bool TeamBaseMatch::allowPawnDeath(Pawn* victim, Pawn* originator)
{
@@ -116,10 +88,10 @@
if (pawn1 && base)
{
std::map<PlayerInfo*, int>::const_iterator it1 = this->teamnumbers_.find(pawn1->getPlayer());
- int teamnrbase = -1;
- int teamnrplayer = getTeam(pawn1->getPlayer());
+ int teamnrbase = -1;
+ int teamnrplayer = getTeam(pawn1->getPlayer());
- switch(base->getState())
+ switch (base->getState())
{
case BaseState::controlTeam1:
teamnrbase = 0;
@@ -129,13 +101,11 @@
break;
case BaseState::uncontrolled:
default:
- teamnrbase = -1;
- }
+ teamnrbase = -1;
+ }
-
- if(teamnrbase == teamnrplayer){
- return false;
- }
+ if (teamnrbase == teamnrplayer)
+ return false;
}
return true;
}
@@ -154,7 +124,7 @@
// show points or each interval of time
void TeamBaseMatch::showPoints()
{
-
+
COUT(0) << "Points standing:" << std::endl << "Team 1: "<< pointsTeam1_ << std::endl << "Team 2: " << pointsTeam2_ << std::endl;
if(pointsTeam1_ >=1700) COUT(0) << "Team 1 is near victory!" << std::endl;
if(pointsTeam2_ >=1700) COUT(0) << "Team 2 is near victory!" << std::endl;
@@ -204,7 +174,7 @@
if(team == 1)
{
this->pointsTeam2_ += points;
- }
+ }
this->endGame();
}
@@ -226,7 +196,7 @@
}
return 0;
}
-
+
}
-
+
Modified: branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.h
===================================================================
--- branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.h 2009-05-23 16:24:32 UTC (rev 3019)
+++ branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.h 2009-05-23 17:04:10 UTC (rev 3020)
@@ -20,9 +20,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Author:
- * Fabian 'x3n' Landau
- * Co-authors:
* Val Mikos
+ * Co-authors:
+ * ...
*
*/
@@ -31,64 +31,40 @@
#include "OrxonoxPrereqs.h"
-#include <vector>
#include <set>
-
#include "TeamDeathmatch.h"
#include "tools/Timer.h"
-
-
namespace orxonox
{
- class TeamBaseMatchBase;
-
-
class _OrxonoxExport TeamBaseMatch : public TeamDeathmatch
{
public:
TeamBaseMatch(BaseObject* creator);
-
- // if class closes, close everything
virtual ~TeamBaseMatch() {}
-
-
- // set Base positions with XML
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-
+
virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = 0);
+ virtual bool allowPawnDamage(Pawn* victim, Pawn* originator);
- virtual bool allowPawnDamage(Pawn* victim, Pawn* originator);
-
-
-
- // give information about the state of a base
- // (this should be pretty useless atm)
-// virtual int baseState(Base);
-
- virtual void playerScored(PlayerInfo* player);
+ virtual void playerScored(PlayerInfo* player);
virtual void showPoints();
virtual void endGame();
-
+
void addBase(TeamBaseMatchBase* base);
TeamBaseMatchBase* getBase(unsigned int index) const;
void addTeamPoints(int team, int points);
-
-
-
-
+
protected:
void winPoints();
-
- bool pawnsAreInTheSameTeam(Pawn* pawn1, TeamBaseMatchBase* base);
+ bool pawnsAreInTheSameTeam(Pawn* pawn1, TeamBaseMatchBase* base);
using TeamDeathmatch::pawnsAreInTheSameTeam;
std::set<TeamBaseMatchBase*> bases_;
Timer<TeamBaseMatch> scoreTimer_;
Timer<TeamBaseMatch> outputTimer_;
-
+
//points for each team
int pointsTeam1_;
int pointsTeam2_;
Modified: branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.cc
===================================================================
--- branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.cc 2009-05-23 16:24:32 UTC (rev 3019)
+++ branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.cc 2009-05-23 17:04:10 UTC (rev 3020)
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Author:
- * Fabian 'x3n' Landau
+ * Matthias Mock
* Co-authors:
* ...
*
@@ -31,11 +31,11 @@
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
-#include "objects/Teamcolourable.h"
-#include "objects/worldentities/TeamSpawnPoint.h"
#include "util/Convert.h"
-
#include "network/Host.h"
+
+#include "objects/worldentities/pawns/Destroyer.h"
+
namespace orxonox
{
CreateUnloadableFactory(UnderAttack);
@@ -167,5 +167,4 @@
}
}
}
-
}
Modified: branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.h
===================================================================
--- branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.h 2009-05-23 16:24:32 UTC (rev 3019)
+++ branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.h 2009-05-23 17:04:10 UTC (rev 3020)
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Author:
- * Fabian 'x3n' Landau
+ * Matthias Mock
* Co-authors:
* ...
*
@@ -31,8 +31,6 @@
#include "OrxonoxPrereqs.h"
-#include <vector>
-#include "objects/worldentities/pawns/Destroyer.h"
#include "TeamDeathmatch.h"
#include "objects/worldentities/pawns/Pawn.h"
Modified: branches/gametypes/src/orxonox/objects/worldentities/ForceField.cc
===================================================================
--- branches/gametypes/src/orxonox/objects/worldentities/ForceField.cc 2009-05-23 16:24:32 UTC (rev 3019)
+++ branches/gametypes/src/orxonox/objects/worldentities/ForceField.cc 2009-05-23 17:04:10 UTC (rev 3020)
@@ -52,21 +52,21 @@
void ForceField::XMLPort(Element& xmlelement, XMLPort::Mode mode)
{
SUPER(ForceField, XMLPort, xmlelement, mode);
-
+
//For correct xml import use: position, direction, velocity, scale
XMLPortParam(ForceField, "velocity", setVelocity, getVelocity, xmlelement, mode).defaultValues(100);
XMLPortParam(ForceField, "diameter", setDiameter, getDiameter, xmlelement, mode).defaultValues(500);
XMLPortParam(ForceField, "length" , setLength , getLength , xmlelement, mode).defaultValues(2000);
}
-
+
void ForceField::tick(float dt)
{
-
+
for (ObjectList<MobileEntity>::iterator it = ObjectList<MobileEntity>::begin(); it != ObjectList<MobileEntity>::end(); ++it)
{
-
- //calculate from
+
+ //calculate from
Vector3 directionVec = this->getOrientation() * WorldEntity::FRONT;
directionVec.normalise();
@@ -80,7 +80,7 @@
//normalize distance from center
it->applyCentralForce(((diameter_ / 2 - distFromCenterVec) / (diameter_ / 2)) * directionVec * velocity_);
}
-
+
}
}
}
Modified: branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.cc
===================================================================
--- branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.cc 2009-05-23 16:24:32 UTC (rev 3019)
+++ branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.cc 2009-05-23 17:04:10 UTC (rev 3020)
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Author:
- * Fabian 'x3n' Landau
+ * Matthias Mock
* Co-authors:
* ...
*
@@ -29,15 +29,7 @@
#include "OrxonoxStableHeaders.h"
#include "Destroyer.h"
-#include "BulletDynamics/Dynamics/btRigidBody.h"
-
-#include "util/Math.h"
-#include "util/Exception.h"
#include "core/CoreIncludes.h"
-#include "core/ConfigValueIncludes.h"
-#include "core/Template.h"
-#include "core/XMLPort.h"
-#include "objects/items/Engine.h"
#include "objects/gametypes/UnderAttack.h"
namespace orxonox
@@ -54,5 +46,4 @@
gametype->addDestroyer(this);
}
}
-
}
Modified: branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.h
===================================================================
--- branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.h 2009-05-23 16:24:32 UTC (rev 3019)
+++ branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.h 2009-05-23 17:04:10 UTC (rev 3020)
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Author:
- * Fabian 'x3n' Landau
+ * Matthias Mock
* Co-authors:
* ...
*
@@ -31,8 +31,6 @@
#include "OrxonoxPrereqs.h"
-#include "LinearMath/btVector3.h"
-
#include "SpaceShip.h"
namespace orxonox
Modified: branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc
===================================================================
--- branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc 2009-05-23 16:24:32 UTC (rev 3019)
+++ branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc 2009-05-23 17:04:10 UTC (rev 3020)
@@ -20,9 +20,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Author:
- * Fabian 'x3n' Landau
+ * Val Mikos
* Co-authors:
- * Val Mikos
+ * ...
*
*/
@@ -73,7 +73,7 @@
break;
}
-
+
std::set<WorldEntity*> attachments = this->getAttachedObjects();
for (std::set<WorldEntity*>::iterator it = attachments.begin(); it != attachments.end(); ++it)
{
Modified: branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h
===================================================================
--- branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h 2009-05-23 16:24:32 UTC (rev 3019)
+++ branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h 2009-05-23 17:04:10 UTC (rev 3020)
@@ -20,21 +20,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Author:
- * Fabian 'x3n' Landau
- * Co-authors:
* Val Mikos
+ * Co-authors:
+ * ...
*
*/
-
-
-// setState und getState functions declare here
-// TeamBaseMatchBase class
-
-
-// save as TeamBaseMatchBase.h in objects/worldentities/pawns/TeamBaseMatchBase.h
-
-
#ifndef _TeamBaseMatchBase_H__
#define _TeamBaseMatchBase_H__
@@ -60,24 +51,24 @@
public:
TeamBaseMatchBase(BaseObject* creator);
- // if class closes, close everything
+ // if class closes, close everything
virtual ~TeamBaseMatchBase() {}
-
-
-
- // Set the state of a base to whatever the argument of the function is
+
+
+
+ // Set the state of a base to whatever the argument of the function is
void setState(BaseState::Enum state)
{
this->state_ = state;
this->changeTeamColour();
- }
+ }
- // Get the state of a base as a return value
- BaseState::Enum getState()
- {
- return this->state_;
- }
+ // Get the state of a base as a return value
+ BaseState::Enum getState() const
+ {
+ return this->state_;
+ }
protected:
Modified: branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.cc
===================================================================
--- branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.cc 2009-05-23 16:24:32 UTC (rev 3019)
+++ branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.cc 2009-05-23 17:04:10 UTC (rev 3020)
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Author:
- * Aurelian
+ * Aurelian Jaggi
* Co-authors:
* ...
*
@@ -28,14 +28,11 @@
#include "OrxonoxStableHeaders.h"
#include "CheckPoint.h"
-#include "objects/gametypes/Asteroids.h"
-#include <OgreNode.h>
-
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-#include "orxonox/objects/worldentities/ControllableEntity.h"
+#include "objects/gametypes/Asteroids.h"
#include "orxonox/objects/worldentities/pawns/Pawn.h"
namespace orxonox
@@ -58,7 +55,7 @@
CheckPoint::~CheckPoint()
{
}
-
+
void CheckPoint::XMLPort(Element& xmlelement, XMLPort::Mode mode)
{
SUPER(CheckPoint, XMLPort, xmlelement, mode);
@@ -67,14 +64,14 @@
XMLPortParam(CheckPoint, "isdestination", setDestination, getDestination, xmlelement, mode).defaultValues(false);
XMLPortParam(CheckPoint, "addtime", setAddTime, getAddTime, xmlelement, mode).defaultValues(30);
}
-
+
void CheckPoint::triggered(bool bIsTriggered)
{
DistanceTrigger::triggered(bIsTriggered);
Asteroids* gametype = dynamic_cast<Asteroids*>(this->getGametype());
if (gametype)
- {
+ {
gametype->addTime(addTime_);
if (bIsTriggered && bIsFirst_)
@@ -82,7 +79,7 @@
gametype->setTimeLimit(addTime_);
gametype->firstCheckpointReached(true);
}
-
+
if (bIsTriggered && bIsDestination_)
{
gametype->end();
Modified: branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.h
===================================================================
--- branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.h 2009-05-23 16:24:32 UTC (rev 3019)
+++ branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.h 2009-05-23 17:04:10 UTC (rev 3020)
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Author:
- * Aurelian
+ * Aurelian Jaggi
* Co-authors:
* ...
*
@@ -29,7 +29,6 @@
/**
@file
@brief
- Definition of the PlayerTrigger class.
*/
#ifndef _CheckPoint_H__
@@ -37,33 +36,26 @@
#include "DistanceTrigger.h"
-#include <set>
-
-#include "core/ClassTreeMask.h"
-#include "core/BaseObject.h"
-
-#include "orxonox/objects/worldentities/ControllableEntity.h"
-
namespace orxonox
{
class _OrxonoxExport CheckPoint : public DistanceTrigger
- {
+ {
public:
CheckPoint(BaseObject* creator);
virtual ~CheckPoint();
-
+
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a CheckPoint object through XML.
private:
- virtual void triggered(bool bIsTriggered);
+ virtual void triggered(bool bIsTriggered);
virtual void notifyMaskUpdate();
inline void setDestination(bool isDestination)
{ bIsDestination_ = isDestination; }
inline bool getDestination()
- { return bIsDestination_; }
-
+ { return bIsDestination_; }
+
inline void setFirst(bool isFirst)
{ this->bIsFirst_ = isFirst; }
@@ -75,7 +67,7 @@
inline bool getAddTime()
{ return this->addTime_; }
-
+
bool bIsFirst_;
bool bIsDestination_;
float addTime_;
Modified: branches/gametypes/src/orxonox/overlays/hud/HUDTimer.cc
===================================================================
--- branches/gametypes/src/orxonox/overlays/hud/HUDTimer.cc 2009-05-23 16:24:32 UTC (rev 3019)
+++ branches/gametypes/src/orxonox/overlays/hud/HUDTimer.cc 2009-05-23 17:04:10 UTC (rev 3020)
@@ -29,14 +29,9 @@
#include "OrxonoxStableHeaders.h"
#include "HUDTimer.h"
-#include <OgreTextAreaOverlayElement.h>
-
#include "core/CoreIncludes.h"
#include "util/Convert.h"
-#include "objects/infos/GametypeInfo.h"
-#include "objects/infos/PlayerInfo.h"
#include "objects/worldentities/ControllableEntity.h"
-#include "objects/worldentities/pawns/Spectator.h"
#include "objects/gametypes/Gametype.h"
namespace orxonox
@@ -67,7 +62,7 @@
}
void HUDTimer::changedOwner()
- {
+ {
SUPER(HUDTimer, changedOwner);
this->owner_ = dynamic_cast<ControllableEntity*>(this->getOwner());
Modified: branches/gametypes/src/orxonox/overlays/hud/HUDTimer.h
===================================================================
--- branches/gametypes/src/orxonox/overlays/hud/HUDTimer.h 2009-05-23 16:24:32 UTC (rev 3019)
+++ branches/gametypes/src/orxonox/overlays/hud/HUDTimer.h 2009-05-23 17:04:10 UTC (rev 3020)
@@ -48,6 +48,6 @@
private:
ControllableEntity* owner_;
- };
+ };
}
#endif /* _HUDTimer_H__ */
More information about the Orxonox-commit
mailing list