[Orxonox-commit 7224] r11838 - code/branches/OrxyRoad_FS18/src/modules/orxyroad
jacobsr at orxonox.net
jacobsr at orxonox.net
Thu Mar 29 15:30:24 CEST 2018
Author: jacobsr
Date: 2018-03-29 15:30:24 +0200 (Thu, 29 Mar 2018)
New Revision: 11838
Modified:
code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCenterPoint.cc
code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCenterPoint.h
code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCube.cc
code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCube.h
code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadHUDinfo.cc
code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadHUDinfo.h
code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadPrereqs.h
code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadRace.h
code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadRaceShip.cc
code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadRaceShip.h
Log:
changed interal definition to orxyroad namespace
Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCenterPoint.cc
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCenterPoint.cc 2018-03-29 13:26:21 UTC (rev 11837)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCenterPoint.cc 2018-03-29 13:30:24 UTC (rev 11838)
@@ -27,33 +27,33 @@
*/
/**
- @file DodgeRaceCenterPoint.cc
- @brief Implementation of the DodgeRaceCenterPoint class.
+ @file OrxyRoadCenterPoint.cc
+ @brief Implementation of the OrxyRoadCenterPoint class.
*/
-#include "DodgeRaceCenterPoint.h"
+#include "OrxyRoadCenterPoint.h"
#include "core/CoreIncludes.h"
-#include "DodgeRace.h"
+#include "OrxyRoad.h"
namespace orxonox
{
- RegisterClass(DodgeRaceCenterPoint);
+ RegisterClass(OrxyRoadCenterPoint);
- DodgeRaceCenterPoint::DodgeRaceCenterPoint(Context* context) : StaticEntity(context)
+ OrxyRoadCenterPoint::OrxyRoadCenterPoint(Context* context) : StaticEntity(context)
{
- RegisterObject(DodgeRaceCenterPoint);
+ RegisterObject(OrxyRoadCenterPoint);
this->checkGametype();
}
- void DodgeRaceCenterPoint::checkGametype()
+ void OrxyRoadCenterPoint::checkGametype()
{
- if (this->getGametype() != nullptr && this->getGametype()->isA(Class(DodgeRace)))
+ if (this->getGametype() != nullptr && this->getGametype()->isA(Class(OrxyRoad)))
{
- DodgeRace* DodgeRaceGametype = orxonox_cast<DodgeRace*>(this->getGametype());
- DodgeRaceGametype->setCenterpoint(this);
+ OrxyRoad* OrxyRoadGametype = orxonox_cast<OrxyRoad*>(this->getGametype());
+ OrxyRoadGametype->setCenterpoint(this);
}
}
}
Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCenterPoint.h
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCenterPoint.h 2018-03-29 13:26:21 UTC (rev 11837)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCenterPoint.h 2018-03-29 13:30:24 UTC (rev 11838)
@@ -27,27 +27,27 @@
*/
/**
- @file DodgeRaceCenterPoint.h
- @brief Declaration of the DodgeRaceCenterPoint class.
- @ingroup DodgeRace
+ @file OrxyRoadCenterPoint.h
+ @brief Declaration of the OrxyRoadCenterPoint class.
+ @ingroup OrxyRoad
*/
-#ifndef _DodgeRaceCenterPoint_H__
-#define _DodgeRaceCenterPoint_H__
+#ifndef _OrxyRoadCenterPoint_H__
+#define _OrxyRoadCenterPoint_H__
-#include "dodgerace/DodgeRacePrereqs.h"
+#include "OrxyRoad/OrxyRoadPrereqs.h"
-//#include "DodgeRace.h"
-//#include "DodgeRaceHUDinfo.h"
+//#include "OrxyRoad.h"
+//#include "OrxyRoadHUDinfo.h"
#include "worldentities/StaticEntity.h"
namespace orxonox
{
- class _DodgeRaceExport DodgeRaceCenterPoint : public StaticEntity
+ class _OrxyRoadExport OrxyRoadCenterPoint : public StaticEntity
{
public:
- DodgeRaceCenterPoint(Context* context); //checks whether the gametype is actually DodgeRace.
+ OrxyRoadCenterPoint(Context* context); //checks whether the gametype is actually OrxyRoad.
private:
void checkGametype();
@@ -55,4 +55,4 @@
};
}
-#endif /* _DodgeRaceCenterPoint_H__ */
+#endif /* _OrxyRoadCenterPoint_H__ */
Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCube.cc
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCube.cc 2018-03-29 13:26:21 UTC (rev 11837)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCube.cc 2018-03-29 13:30:24 UTC (rev 11838)
@@ -26,21 +26,21 @@
*/
/**
- @file DodgeRace.cc
- @brief Implementation of the DodgeRace class.
+ @file OrxyRoad.cc
+ @brief Implementation of the OrxyRoad class.
*/
-#include "DodgeRaceCube.h"
-#include "DodgeRace.h"
+#include "OrxyRoadCube.h"
+#include "OrxyRoad.h"
#include "core/CoreIncludes.h"
namespace orxonox
{
- RegisterClass(DodgeRaceCube);
+ RegisterClass(OrxyRoadCube);
- DodgeRaceCube::DodgeRaceCube(Context* context) : MovableEntity(context)
+ OrxyRoadCube::OrxyRoadCube(Context* context) : MovableEntity(context)
{
- RegisterObject(DodgeRaceCube);
+ RegisterObject(OrxyRoadCube);
}
Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCube.h
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCube.h 2018-03-29 13:26:21 UTC (rev 11837)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadCube.h 2018-03-29 13:30:24 UTC (rev 11838)
@@ -27,15 +27,15 @@
*/
/**
- @file DodgeRace.h
+ @file OrxyRoad.h
@brief Gametype.
- @ingroup DodgeRace
+ @ingroup OrxyRoad
*/
-#ifndef _DodgeRaceCube_H__
-#define _DodgeRaceCube_H__
+#ifndef _OrxyRoadCube_H__
+#define _OrxyRoadCube_H__
-#include "dodgerace/DodgeRacePrereqs.h"
+#include "OrxyRoad/OrxyRoadPrereqs.h"
#include "worldentities/MovableEntity.h"
@@ -42,13 +42,13 @@
namespace orxonox
{
- class _DodgeRaceExport DodgeRaceCube : public MovableEntity
+ class _OrxyRoadExport OrxyRoadCube : public MovableEntity
{
public:
- DodgeRaceCube(Context* context);
+ OrxyRoadCube(Context* context);
private:
};
}
-#endif /* _DodgeRaceCube_H__ */
+#endif /* _OrxyRoadCube_H__ */
Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadHUDinfo.cc
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadHUDinfo.cc 2018-03-29 13:26:21 UTC (rev 11837)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadHUDinfo.cc 2018-03-29 13:30:24 UTC (rev 11838)
@@ -24,41 +24,41 @@
*
*/
-#include "DodgeRaceHUDinfo.h"
+#include "OrxyRoadHUDinfo.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "util/Convert.h"
-//#include "DodgeRace.h"
+//#include "OrxyRoad.h"
namespace orxonox
{
- RegisterClass(DodgeRaceHUDinfo);
+ RegisterClass(OrxyRoadHUDinfo);
- DodgeRaceHUDinfo::DodgeRaceHUDinfo(Context* context) : OverlayText(context)
+ OrxyRoadHUDinfo::OrxyRoadHUDinfo(Context* context) : OverlayText(context)
{
- RegisterObject(DodgeRaceHUDinfo);
+ RegisterObject(OrxyRoadHUDinfo);
- this->DodgeRaceGame = nullptr;
+ this->OrxyRoadGame = nullptr;
this->bShowPoints_ = true;
}
- void DodgeRaceHUDinfo::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+ void OrxyRoadHUDinfo::XMLPort(Element& xmlelement, XMLPort::Mode mode)
{
- SUPER(DodgeRaceHUDinfo, XMLPort, xmlelement, mode);
+ SUPER(OrxyRoadHUDinfo, XMLPort, xmlelement, mode);
- XMLPortParam(DodgeRaceHUDinfo,"showPoints", setShowPoints, getShowPoints, xmlelement, mode).defaultValues(false);
+ XMLPortParam(OrxyRoadHUDinfo,"showPoints", setShowPoints, getShowPoints, xmlelement, mode).defaultValues(false);
}
- void DodgeRaceHUDinfo::tick(float dt)
+ void OrxyRoadHUDinfo::tick(float dt)
{
- SUPER(DodgeRaceHUDinfo, tick, dt);
+ SUPER(OrxyRoadHUDinfo, tick, dt);
if(this->bShowPoints_)
{
- const std::string& points = multi_cast<std::string>(this->DodgeRaceGame->getPoints());
- if (this->DodgeRaceGame->lives <= 0)
+ const std::string& points = multi_cast<std::string>(this->OrxyRoadGame->getPoints());
+ if (this->OrxyRoadGame->lives <= 0)
{
setTextSize(0.2);
setPosition(Vector2(0.1, 0.02));
@@ -75,17 +75,17 @@
}
}
- void DodgeRaceHUDinfo::changedOwner()
+ void OrxyRoadHUDinfo::changedOwner()
{
- SUPER(DodgeRaceHUDinfo, changedOwner);
+ SUPER(OrxyRoadHUDinfo, changedOwner);
if (this->getOwner() && this->getOwner()->getGametype())
{
- this->DodgeRaceGame = orxonox_cast<DodgeRace*>(this->getOwner()->getGametype());
+ this->OrxyRoadGame = orxonox_cast<OrxyRoad*>(this->getOwner()->getGametype());
}
else
{
- this->DodgeRaceGame = nullptr;
+ this->OrxyRoadGame = nullptr;
}
}
}
Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadHUDinfo.h
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadHUDinfo.h 2018-03-29 13:26:21 UTC (rev 11837)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadHUDinfo.h 2018-03-29 13:30:24 UTC (rev 11838)
@@ -24,14 +24,14 @@
*
*/
-#ifndef _DodgeRaceHUDinfo_H__
-#define _DodgeRaceHUDinfo_H__
+#ifndef _OrxyRoadHUDinfo_H__
+#define _OrxyRoadHUDinfo_H__
-//#include "DodgeRaceShip.h"
-#include "DodgeRace.h"
-//#include "DodgeRaceCenterPoint.h"
+//#include "OrxyRoadShip.h"
+#include "OrxyRoad.h"
+//#include "OrxyRoadCenterPoint.h"
-#include "dodgerace/DodgeRacePrereqs.h"
+#include "OrxyRoad/OrxyRoadPrereqs.h"
#include "tools/interfaces/Tickable.h"
#include "overlays/OverlayText.h"
@@ -38,10 +38,10 @@
namespace orxonox
{
- class _DodgeRaceExport DodgeRaceHUDinfo : public OverlayText, public Tickable
+ class _OrxyRoadExport OrxyRoadHUDinfo : public OverlayText, public Tickable
{
public:
- DodgeRaceHUDinfo(Context* context);
+ OrxyRoadHUDinfo(Context* context);
virtual void tick(float dt) override;
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
@@ -54,8 +54,8 @@
private:
- DodgeRace* DodgeRaceGame;
+ OrxyRoad* OrxyRoadGame;
bool bShowPoints_;
};
}
-#endif /* _DodgeRaceHUDinfo_H__ */
+#endif /* _OrxyRoadHUDinfo_H__ */
Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadPrereqs.h
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadPrereqs.h 2018-03-29 13:26:21 UTC (rev 11837)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadPrereqs.h 2018-03-29 13:30:24 UTC (rev 11838)
@@ -29,11 +29,11 @@
/**
@file
@brief
- Shared library macros, enums, constants and forward declarations for the DodgeRace module
+ Shared library macros, enums, constants and forward declarations for the OrxyRoad module
*/
-#ifndef _DodgeRacePrereqs_H__
-#define _DodgeRacePrereqs_H__
+#ifndef _OrxyRoadPrereqs_H__
+#define _OrxyRoadPrereqs_H__
#include "OrxonoxConfig.h"
#include "OrxonoxPrereqs.h"
@@ -42,23 +42,23 @@
// Shared library settings
//-----------------------------------------------------------------------
-#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(DODGERACE_STATIC_BUILD)
-# ifdef DODGERACE_SHARED_BUILD
-# define _DodgeRaceExport __declspec(dllexport)
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(OrxyRoad_STATIC_BUILD)
+# ifdef OrxyRoad_SHARED_BUILD
+# define _OrxyRoadExport __declspec(dllexport)
# else
# if defined( __MINGW32__ )
-# define _DodgeRaceExport
+# define _OrxyRoadExport
# else
-# define _DodgeRaceExport __declspec(dllimport)
+# define _OrxyRoadExport __declspec(dllimport)
# endif
# endif
-# define _DodgeRacePrivate
+# define _OrxyRoadPrivate
#elif defined (ORXONOX_GCC_VISIBILITY)
-# define _DodgeRaceExport __attribute__ ((visibility("default")))
-# define _DodgeRacePrivate __attribute__ ((visibility("hidden")))
+# define _OrxyRoadExport __attribute__ ((visibility("default")))
+# define _OrxyRoadPrivate __attribute__ ((visibility("hidden")))
#else
-# define _DodgeRaceExport
-# define _DodgeRacePrivate
+# define _OrxyRoadExport
+# define _OrxyRoadPrivate
#endif
//-----------------------------------------------------------------------
@@ -67,15 +67,15 @@
namespace orxonox
{
- class DodgeRace;
- class DodgeRaceCenterPoint;
- class DodgeRaceShip;
- class DodgeRaceCube;
- //class DodgeRaceEnemy;
- //class DodgeRaceEnemyShooter;
- //class DodgeRaceWeapon;
- //class DodgeRaceWeaponEnemy;
- //class DodgeRaceHUDinfo;
+ class OrxyRoad;
+ class OrxyRoadCenterPoint;
+ class OrxyRoadShip;
+ class OrxyRoadCube;
+ //class OrxyRoadEnemy;
+ //class OrxyRoadEnemyShooter;
+ //class OrxyRoadWeapon;
+ //class OrxyRoadWeaponEnemy;
+ //class OrxyRoadHUDinfo;
}
-#endif /* _DodgeRacePrereqs_H__*/
+#endif /* _OrxyRoadPrereqs_H__*/
Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadRace.h
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadRace.h 2018-03-29 13:26:21 UTC (rev 11837)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadRace.h 2018-03-29 13:30:24 UTC (rev 11838)
@@ -27,20 +27,20 @@
*/
/**
- @file DodgeRace.h
+ @file OrxyRoad.h
@brief Gametype.
- @ingroup DodgeRace
+ @ingroup OrxyRoad
*/
-#ifndef _DodgeRace_H__
-#define _DodgeRace_H__
+#ifndef _OrxyRoad_H__
+#define _OrxyRoad_H__
-#include "dodgerace/DodgeRacePrereqs.h"
+#include "OrxyRoad/OrxyRoadPrereqs.h"
-#include "DodgeRaceCenterPoint.h" // Necessary for WeakPointer??
-//#include "DodgeRaceShip.h" DO NOT include in Header. Will cause forward declaration issues
+#include "OrxyRoadCenterPoint.h" // Necessary for WeakPointer??
+//#include "OrxyRoadShip.h" DO NOT include in Header. Will cause forward declaration issues
-//#include "DodgeRaceHUDinfo.h"
+//#include "OrxyRoadHUDinfo.h"
#include "core/EventIncludes.h"
@@ -62,10 +62,10 @@
namespace orxonox
{
- class _DodgeRaceExport DodgeRace : public Deathmatch
+ class _OrxyRoadExport OrxyRoad : public Deathmatch
{
public:
- DodgeRace(Context* context);
+ OrxyRoad(Context* context);
virtual void start() override;
virtual void end() override;
@@ -81,7 +81,7 @@
int getPoints(){return this->point;}
int getMultiplier(){return this->multiplier;}
- void setCenterpoint(DodgeRaceCenterPoint* center)
+ void setCenterpoint(OrxyRoadCenterPoint* center)
{ this->center_ = center; }
virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command
@@ -101,13 +101,13 @@
private:
Timer endGameTimer;
- DodgeRaceShip* getPlayer();
+ OrxyRoadShip* getPlayer();
WeakPtr<PlayerInfo> playerInfo_;
- std::vector<DodgeRaceCube*> cubeList;
+ std::vector<OrxyRoadCube*> cubeList;
void toggleShowLevel(){bShowLevel = !bShowLevel;}
void addPoints(int numPoints);
- WeakPtr<DodgeRaceCenterPoint> center_;
+ WeakPtr<OrxyRoadCenterPoint> center_;
int level;
int point;
bool b_combo;
@@ -142,4 +142,4 @@
};
}
-#endif /* _DodgeRace_H__ */
+#endif /* _OrxyRoad_H__ */
Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadRaceShip.cc
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadRaceShip.cc 2018-03-29 13:26:21 UTC (rev 11837)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadRaceShip.cc 2018-03-29 13:30:24 UTC (rev 11838)
@@ -27,20 +27,20 @@
*/
/**
- @file DodgeRaceShip.cc
- @brief Implementation of the DodgeRaceShip class.
+ @file OrxyRoadShip.cc
+ @brief Implementation of the OrxyRoadShip class.
*/
-#include "DodgeRaceShip.h"
+#include "OrxyRoadShip.h"
#include "core/CoreIncludes.h"
namespace orxonox
{
- RegisterClass(DodgeRaceShip);
+ RegisterClass(OrxyRoadShip);
- DodgeRaceShip::DodgeRaceShip(Context* context) : SpaceShip(context)
+ OrxyRoadShip::OrxyRoadShip(Context* context) : SpaceShip(context)
{
- RegisterObject(DodgeRaceShip);
+ RegisterObject(OrxyRoadShip);
speed = 830;
isFireing = false;
@@ -52,7 +52,7 @@
lastTime = 0;
}
- void DodgeRaceShip::tick(float dt)
+ void OrxyRoadShip::tick(float dt)
{
Vector3 pos = getPosition();
@@ -114,10 +114,10 @@
setPosition(Vector3(0, 0, pos.z)); // pos - Vector3(30000, 0, 0)
}
- SUPER(DodgeRaceShip, tick, dt);
+ SUPER(OrxyRoadShip, tick, dt);
}
- void DodgeRaceShip::updateLevel()
+ void OrxyRoadShip::updateLevel()
{
lastTime = 0;
if (getGame())
@@ -124,7 +124,7 @@
getGame()->levelUp();
}
- void DodgeRaceShip::moveFrontBack(const Vector2& value)
+ void OrxyRoadShip::moveFrontBack(const Vector2& value)
{
//lastTimeFront = 0;
//desiredVelocity.y = value.y * speed * 42;
@@ -131,17 +131,17 @@
}
- void DodgeRaceShip::moveRightLeft(const Vector2& value)
+ void OrxyRoadShip::moveRightLeft(const Vector2& value)
{
lastTimeLeft = 0;
desiredVelocity.x = value.x * speed;
}
- void DodgeRaceShip::boost(bool bBoost)
+ void OrxyRoadShip::boost(bool bBoost)
{
//getGame()->bEndGame = bBoost;
}
- inline bool DodgeRaceShip::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
+ inline bool OrxyRoadShip::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
{
removeHealth(100);
@@ -149,11 +149,11 @@
return false;
}
- DodgeRace* DodgeRaceShip::getGame()
+ OrxyRoad* OrxyRoadShip::getGame()
{
if (game == nullptr)
{
- for (DodgeRace* race : ObjectList<DodgeRace>())
+ for (OrxyRoad* race : ObjectList<OrxyRoad>())
{
game = race;
}
@@ -161,7 +161,7 @@
return game;
}
- void DodgeRaceShip::death()
+ void OrxyRoadShip::death()
{
getGame()->costLife();
SpaceShip::death();
Modified: code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadRaceShip.h
===================================================================
--- code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadRaceShip.h 2018-03-29 13:26:21 UTC (rev 11837)
+++ code/branches/OrxyRoad_FS18/src/modules/orxyroad/OrxyRoadRaceShip.h 2018-03-29 13:30:24 UTC (rev 11838)
@@ -27,29 +27,29 @@
*/
/**
- @file DodgeRaceShip.h
- @brief Declaration of the DodgeRaceShip class.
+ @file OrxyRoadShip.h
+ @brief Declaration of the OrxyRoadShip class.
*/
-#ifndef _DodgeRaceShip_H__
-#define _DodgeRaceShip_H__
+#ifndef _OrxyRoadShip_H__
+#define _OrxyRoadShip_H__
-#include "dodgerace/DodgeRacePrereqs.h"
+#include "OrxyRoad/OrxyRoadPrereqs.h"
#include "core/XMLPort.h"
#include "worldentities/pawns/SpaceShip.h"
#include "graphics/Camera.h"
-#include "DodgeRace.h" // Is necessary for getGame function
-//#include "DodgeRaceCenterPoint.h"
+#include "OrxyRoad.h" // Is necessary for getGame function
+//#include "OrxyRoadCenterPoint.h"
namespace orxonox
{
- class _DodgeRaceExport DodgeRaceShip : public SpaceShip
+ class _OrxyRoadExport OrxyRoadShip : public SpaceShip
{
public:
- DodgeRaceShip(Context* context);
+ OrxyRoadShip(Context* context);
virtual void tick(float dt) override;
@@ -78,8 +78,8 @@
virtual void death() override;
private:
- DodgeRace* getGame();
- WeakPtr<DodgeRace> game;
+ OrxyRoad* getGame();
+ WeakPtr<OrxyRoad> game;
WeakPtr<WorldEntity> lastEntity;
Camera* camera;
float lastTimeFront, lastTimeLeft, lastTime;
@@ -92,4 +92,4 @@
};
}
-#endif /* _DodgeRaceShip_H__ */
+#endif /* _OrxyRoadShip_H__ */
More information about the Orxonox-commit
mailing list