[Orxonox-commit 5783] r10443 - in code/branches/cpp11/src: libraries/tools libraries/util modules/invader modules/jump
landauf at orxonox.net
landauf at orxonox.net
Sun May 17 21:45:03 CEST 2015
Author: landauf
Date: 2015-05-17 21:45:02 +0200 (Sun, 17 May 2015)
New Revision: 10443
Modified:
code/branches/cpp11/src/libraries/tools/BulletDebugDrawer.h
code/branches/cpp11/src/libraries/tools/OgreBulletUtils.h
code/branches/cpp11/src/libraries/util/SmallObjectAllocator.h
code/branches/cpp11/src/modules/invader/Invader.cc
code/branches/cpp11/src/modules/invader/Invader.h
code/branches/cpp11/src/modules/invader/InvaderEnemy.cc
code/branches/cpp11/src/modules/invader/InvaderEnemy.h
code/branches/cpp11/src/modules/invader/InvaderEnemyShooter.cc
code/branches/cpp11/src/modules/invader/InvaderHUDinfo.cc
code/branches/cpp11/src/modules/invader/InvaderShip.cc
code/branches/cpp11/src/modules/invader/InvaderShip.h
code/branches/cpp11/src/modules/invader/InvaderWeapon.h
code/branches/cpp11/src/modules/invader/InvaderWeaponEnemy.cc
code/branches/cpp11/src/modules/invader/InvaderWeaponEnemy.h
code/branches/cpp11/src/modules/jump/Jump.cc
code/branches/cpp11/src/modules/jump/Jump.h
code/branches/cpp11/src/modules/jump/JumpBoots.cc
code/branches/cpp11/src/modules/jump/JumpBoots.h
code/branches/cpp11/src/modules/jump/JumpCenterpoint.cc
code/branches/cpp11/src/modules/jump/JumpCenterpoint.h
code/branches/cpp11/src/modules/jump/JumpEnemy.cc
code/branches/cpp11/src/modules/jump/JumpEnemy.h
code/branches/cpp11/src/modules/jump/JumpFigure.cc
code/branches/cpp11/src/modules/jump/JumpItem.cc
code/branches/cpp11/src/modules/jump/JumpItem.h
code/branches/cpp11/src/modules/jump/JumpPlatform.cc
code/branches/cpp11/src/modules/jump/JumpPlatform.h
code/branches/cpp11/src/modules/jump/JumpPlatformDisappear.cc
code/branches/cpp11/src/modules/jump/JumpPlatformDisappear.h
code/branches/cpp11/src/modules/jump/JumpPlatformFake.cc
code/branches/cpp11/src/modules/jump/JumpPlatformFake.h
code/branches/cpp11/src/modules/jump/JumpPlatformHMove.cc
code/branches/cpp11/src/modules/jump/JumpPlatformHMove.h
code/branches/cpp11/src/modules/jump/JumpPlatformStatic.cc
code/branches/cpp11/src/modules/jump/JumpPlatformStatic.h
code/branches/cpp11/src/modules/jump/JumpPlatformTimer.cc
code/branches/cpp11/src/modules/jump/JumpPlatformTimer.h
code/branches/cpp11/src/modules/jump/JumpPlatformVMove.cc
code/branches/cpp11/src/modules/jump/JumpPlatformVMove.h
code/branches/cpp11/src/modules/jump/JumpProjectile.cc
code/branches/cpp11/src/modules/jump/JumpPropeller.cc
code/branches/cpp11/src/modules/jump/JumpPropeller.h
code/branches/cpp11/src/modules/jump/JumpRocket.cc
code/branches/cpp11/src/modules/jump/JumpRocket.h
code/branches/cpp11/src/modules/jump/JumpScore.cc
code/branches/cpp11/src/modules/jump/JumpShield.cc
code/branches/cpp11/src/modules/jump/JumpShield.h
code/branches/cpp11/src/modules/jump/JumpSpring.cc
code/branches/cpp11/src/modules/jump/JumpSpring.h
Log:
fixed includes to make it compile without build units
Modified: code/branches/cpp11/src/libraries/tools/BulletDebugDrawer.h
===================================================================
--- code/branches/cpp11/src/libraries/tools/BulletDebugDrawer.h 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/libraries/tools/BulletDebugDrawer.h 2015-05-17 19:45:02 UTC (rev 10443)
@@ -12,6 +12,8 @@
#include <btBulletCollisionCommon.h>
#include <OgreFrameListener.h>
+#include <OgreVector3.h>
+#include <OgreColourValue.h>
namespace orxonox
{
Modified: code/branches/cpp11/src/libraries/tools/OgreBulletUtils.h
===================================================================
--- code/branches/cpp11/src/libraries/tools/OgreBulletUtils.h 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/libraries/tools/OgreBulletUtils.h 2015-05-17 19:45:02 UTC (rev 10443)
@@ -9,6 +9,11 @@
#define _OgreBulletUtils_H__
#include "tools/ToolsPrereqs.h"
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
+#include <OgreColourValue.h>
+#include <OgreMatrix3.h>
+#include <OgreMatrix4.h>
namespace orxonox
{
@@ -41,7 +46,7 @@
inline Ogre::Matrix3 matrix3(const btMatrix3x3& matrix)
{
- return Matrix3(
+ return Ogre::Matrix3(
matrix[0][0], matrix[0][1], matrix[0][2],
matrix[1][0], matrix[1][1], matrix[1][2],
matrix[2][0], matrix[2][1], matrix[2][2]
Modified: code/branches/cpp11/src/libraries/util/SmallObjectAllocator.h
===================================================================
--- code/branches/cpp11/src/libraries/util/SmallObjectAllocator.h 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/libraries/util/SmallObjectAllocator.h 2015-05-17 19:45:02 UTC (rev 10443)
@@ -76,6 +76,7 @@
#include "UtilPrereqs.h"
#include <vector>
+#include <cstdio>
namespace orxonox
{
Modified: code/branches/cpp11/src/modules/invader/Invader.cc
===================================================================
--- code/branches/cpp11/src/modules/invader/Invader.cc 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/invader/Invader.cc 2015-05-17 19:45:02 UTC (rev 10443)
@@ -133,6 +133,11 @@
}
}
+ void Invader::setCenterpoint(InvaderCenterPoint* center)
+ {
+ this->center_ = center;
+ }
+
void Invader::costLife()
{
lives--;
Modified: code/branches/cpp11/src/modules/invader/Invader.h
===================================================================
--- code/branches/cpp11/src/modules/invader/Invader.h 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/invader/Invader.h 2015-05-17 19:45:02 UTC (rev 10443)
@@ -38,9 +38,6 @@
#include "invader/InvaderPrereqs.h"
#include "gametypes/Deathmatch.h"
-
-#include "InvaderCenterPoint.h"
-
#include "tools/Timer.h"
namespace orxonox
@@ -57,8 +54,7 @@
void spawnEnemy();
- void setCenterpoint(InvaderCenterPoint* center)
- { this->center_ = center; }
+ void setCenterpoint(InvaderCenterPoint* center);
int getLives(){return this->lives;}
int getLevel(){return this->level;}
Modified: code/branches/cpp11/src/modules/invader/InvaderEnemy.cc
===================================================================
--- code/branches/cpp11/src/modules/invader/InvaderEnemy.cc 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/invader/InvaderEnemy.cc 2015-05-17 19:45:02 UTC (rev 10443)
@@ -31,8 +31,10 @@
@brief Declaration of the InvaderEnemy class.
*/
-#include "invader/InvaderPrereqs.h"
#include "InvaderEnemy.h"
+
+#include "core/CoreIncludes.h"
+#include "Invader.h"
#include "InvaderShip.h"
namespace orxonox
@@ -84,4 +86,4 @@
if (getGame() && orxonox_cast<InvaderShip*>(originator) != NULL && getHealth() <= 0)
getGame()->addPoints(42);
}
-}
\ No newline at end of file
+}
Modified: code/branches/cpp11/src/modules/invader/InvaderEnemy.h
===================================================================
--- code/branches/cpp11/src/modules/invader/InvaderEnemy.h 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/invader/InvaderEnemy.h 2015-05-17 19:45:02 UTC (rev 10443)
@@ -36,7 +36,7 @@
#include "invader/InvaderPrereqs.h"
-#include "worldentities/pawns/SpaceShip.h"
+#include "worldentities/pawns/Pawn.h"
namespace orxonox
{
Modified: code/branches/cpp11/src/modules/invader/InvaderEnemyShooter.cc
===================================================================
--- code/branches/cpp11/src/modules/invader/InvaderEnemyShooter.cc 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/invader/InvaderEnemyShooter.cc 2015-05-17 19:45:02 UTC (rev 10443)
@@ -31,10 +31,13 @@
@brief Declaration of the InvaderEnemyShooter class.
*/
-#include "invader/InvaderPrereqs.h"
#include "InvaderEnemyShooter.h"
-// #include "worldentities/pawns/SpaceShip.h"
+#include "core/CoreIncludes.h"
+#include "core/command/Executor.h"
+#include "Invader.h"
+#include "InvaderShip.h"
+
namespace orxonox
{
RegisterClass(InvaderEnemyShooter);
@@ -76,4 +79,4 @@
if (getGame() && orxonox_cast<InvaderShip*>(originator) != NULL && getHealth() <= 0)
getGame()->addPoints(3*42);
}
-}
\ No newline at end of file
+}
Modified: code/branches/cpp11/src/modules/invader/InvaderHUDinfo.cc
===================================================================
--- code/branches/cpp11/src/modules/invader/InvaderHUDinfo.cc 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/invader/InvaderHUDinfo.cc 2015-05-17 19:45:02 UTC (rev 10443)
@@ -29,7 +29,7 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "util/Convert.h"
-// #include "Invader.h"
+#include "Invader.h"
namespace orxonox
{
Modified: code/branches/cpp11/src/modules/invader/InvaderShip.cc
===================================================================
--- code/branches/cpp11/src/modules/invader/InvaderShip.cc 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/invader/InvaderShip.cc 2015-05-17 19:45:02 UTC (rev 10443)
@@ -36,6 +36,9 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "Invader.h"
+#include "InvaderEnemy.h"
+#include "graphics/Camera.h"
+#include "weapons/projectiles/Projectile.h"
namespace orxonox
{
@@ -138,6 +141,12 @@
{
isFireing = bBoost;
}
+ void InvaderShip::rotateRoll(const Vector2& value)
+ {
+ if (getGame())
+ if (getGame()->bEndGame)
+ getGame()->end();
+ }
inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
{
// orxout() << "touch!!! " << endl; //<< otherObject << " at " << contactPoint;
Modified: code/branches/cpp11/src/modules/invader/InvaderShip.h
===================================================================
--- code/branches/cpp11/src/modules/invader/InvaderShip.h 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/invader/InvaderShip.h 2015-05-17 19:45:02 UTC (rev 10443)
@@ -36,9 +36,8 @@
#include "invader/InvaderPrereqs.h"
+#include "weapons/WeaponsPrereqs.h"
#include "worldentities/pawns/SpaceShip.h"
-#include "graphics/Camera.h"
-#include "weapons/projectiles/Projectile.h"
namespace orxonox
{
@@ -60,7 +59,7 @@
virtual void rotateYaw(const Vector2& value){};
virtual void rotatePitch(const Vector2& value){};
//return to main menu if game has ended.
- virtual void rotateRoll(const Vector2& value){if (getGame()) if (getGame()->bEndGame) getGame()->end();};
+ virtual void rotateRoll(const Vector2& value);
virtual void updateLevel();
Modified: code/branches/cpp11/src/modules/invader/InvaderWeapon.h
===================================================================
--- code/branches/cpp11/src/modules/invader/InvaderWeapon.h 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/invader/InvaderWeapon.h 2015-05-17 19:45:02 UTC (rev 10443)
@@ -34,11 +34,11 @@
#ifndef _InvaderWeapon_H__
#define _InvaderWeapon_H__
+#include "invader/InvaderPrereqs.h"
+
+#include "weapons/WeaponsPrereqs.h"
#include "weapons/weaponmodes/HsW01.h"
-#include "weapons/WeaponsPrereqs.h"
-#include "tools/Timer.h"
-
namespace orxonox
{
class _InvaderExport InvaderWeapon : public HsW01
Modified: code/branches/cpp11/src/modules/invader/InvaderWeaponEnemy.cc
===================================================================
--- code/branches/cpp11/src/modules/invader/InvaderWeaponEnemy.cc 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/invader/InvaderWeaponEnemy.cc 2015-05-17 19:45:02 UTC (rev 10443)
@@ -33,6 +33,9 @@
#include "InvaderWeaponEnemy.h"
+#include "core/CoreIncludes.h"
+#include "weapons/projectiles/Projectile.h"
+
namespace orxonox
{
RegisterClass(InvaderWeaponEnemy);
Modified: code/branches/cpp11/src/modules/invader/InvaderWeaponEnemy.h
===================================================================
--- code/branches/cpp11/src/modules/invader/InvaderWeaponEnemy.h 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/invader/InvaderWeaponEnemy.h 2015-05-17 19:45:02 UTC (rev 10443)
@@ -34,9 +34,9 @@
#ifndef _InvaderWeaponEnemy_H__
#define _InvaderWeaponEnemy_H__
-// #include "weapons/weaponmodes/HsW01.h"
-// #include "weapons/WeaponsPrereqs.h"
-#include "invader/InvaderWeapon.h"
+#include "invader/InvaderPrereqs.h"
+
+#include "InvaderWeapon.h"
#include "tools/Timer.h"
namespace orxonox
Modified: code/branches/cpp11/src/modules/jump/Jump.cc
===================================================================
--- code/branches/cpp11/src/modules/jump/Jump.cc 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/Jump.cc 2015-05-17 19:45:02 UTC (rev 10443)
@@ -33,11 +33,7 @@
#include "Jump.h"
#include "core/CoreIncludes.h"
-#include "core/EventIncludes.h"
-#include "core/command/Executor.h"
-#include "core/config/ConfigValueIncludes.h"
-#include "gamestates/GSLevel.h"
-#include "chat/ChatManager.h"
+
#include "JumpCenterpoint.h"
#include "JumpPlatform.h"
#include "JumpPlatformStatic.h"
@@ -55,7 +51,10 @@
#include "JumpPropeller.h"
#include "JumpBoots.h"
#include "JumpShield.h"
+
+#include "gamestates/GSLevel.h"
#include "infos/PlayerInfo.h"
+#include "graphics/Camera.h"
namespace orxonox
{
@@ -69,8 +68,6 @@
figure_ = 0;
camera = 0;
setHUDTemplate("JumpHUD");
-
- setConfigValues();
}
Jump::~Jump()
@@ -1299,4 +1296,10 @@
{
return figure_->dead_;
}
+
+ void Jump::setCenterpoint(JumpCenterpoint* center)
+ {
+ center_ = center;
+ }
+
}
Modified: code/branches/cpp11/src/modules/jump/Jump.h
===================================================================
--- code/branches/cpp11/src/modules/jump/Jump.h 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/Jump.h 2015-05-17 19:45:02 UTC (rev 10443)
@@ -30,11 +30,7 @@
#define _Jump_H__
#include "jump/JumpPrereqs.h"
-#include "tools/Timer.h"
-#include "graphics/Camera.h"
#include "gametypes/Deathmatch.h"
-#include "JumpCenterpoint.h"
-#include <list>
namespace orxonox
{
@@ -50,8 +46,7 @@
int getScore(PlayerInfo* player) const;
float getFuel() const;
bool getDead(PlayerInfo* player) const;
- void setCenterpoint(JumpCenterpoint* center)
- { center_ = center; }
+ void setCenterpoint(JumpCenterpoint* center);
PlayerInfo* getPlayer() const;
protected:
Modified: code/branches/cpp11/src/modules/jump/JumpBoots.cc
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpBoots.cc 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpBoots.cc 2015-05-17 19:45:02 UTC (rev 10443)
@@ -34,15 +34,9 @@
#include "JumpBoots.h"
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
-
+#include "core/XMLPort.h"
#include "JumpFigure.h"
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
-
namespace orxonox
{
RegisterClass(JumpBoots);
Modified: code/branches/cpp11/src/modules/jump/JumpBoots.h
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpBoots.h 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpBoots.h 2015-05-17 19:45:02 UTC (rev 10443)
@@ -29,11 +29,9 @@
#ifndef _JumpBoots_H__
#define _JumpBoots_H__
-#include "jump/JumpPrereqs.h"
-#include "util/Math.h"
-#include "worldentities/MovableEntity.h"
+#include "JumpPrereqs.h"
+#include "JumpItem.h"
-
namespace orxonox
{
class _JumpExport JumpBoots : public JumpItem
Modified: code/branches/cpp11/src/modules/jump/JumpCenterpoint.cc
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpCenterpoint.cc 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpCenterpoint.cc 2015-05-17 19:45:02 UTC (rev 10443)
@@ -32,6 +32,7 @@
*/
#include "JumpCenterpoint.h"
+
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "Jump.h"
Modified: code/branches/cpp11/src/modules/jump/JumpCenterpoint.h
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpCenterpoint.h 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpCenterpoint.h 2015-05-17 19:45:02 UTC (rev 10443)
@@ -30,11 +30,6 @@
#define _JumpCenterpoint_H__
#include "jump/JumpPrereqs.h"
-
-#include <string>
-
-#include <util/Math.h>
-
#include "worldentities/StaticEntity.h"
namespace orxonox
Modified: code/branches/cpp11/src/modules/jump/JumpEnemy.cc
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpEnemy.cc 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpEnemy.cc 2015-05-17 19:45:02 UTC (rev 10443)
@@ -34,15 +34,9 @@
#include "JumpEnemy.h"
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
-
+#include "core/XMLPort.h"
#include "JumpFigure.h"
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
-
namespace orxonox
{
RegisterClass(JumpEnemy);
Modified: code/branches/cpp11/src/modules/jump/JumpEnemy.h
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpEnemy.h 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpEnemy.h 2015-05-17 19:45:02 UTC (rev 10443)
@@ -36,12 +36,8 @@
#define _JumpEnemy_H__
#include "jump/JumpPrereqs.h"
-
-#include "util/Math.h"
-
#include "worldentities/MovableEntity.h"
-
namespace orxonox
{
class _JumpExport JumpEnemy : public MovableEntity
Modified: code/branches/cpp11/src/modules/jump/JumpFigure.cc
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpFigure.cc 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpFigure.cc 2015-05-17 19:45:02 UTC (rev 10443)
@@ -35,6 +35,11 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
+#include "graphics/Model.h"
+#include "JumpRocket.h"
+#include "JumpPropeller.h"
+#include "JumpBoots.h"
+#include "JumpShield.h"
namespace orxonox
{
Modified: code/branches/cpp11/src/modules/jump/JumpItem.cc
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpItem.cc 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpItem.cc 2015-05-17 19:45:02 UTC (rev 10443)
@@ -34,15 +34,9 @@
#include "JumpItem.h"
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
-
+#include "core/XMLPort.h"
#include "JumpFigure.h"
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
-
namespace orxonox
{
RegisterClass(JumpItem);
Modified: code/branches/cpp11/src/modules/jump/JumpItem.h
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpItem.h 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpItem.h 2015-05-17 19:45:02 UTC (rev 10443)
@@ -36,9 +36,6 @@
#define _JumpItem_H__
#include "jump/JumpPrereqs.h"
-
-#include "util/Math.h"
-
#include "worldentities/MovableEntity.h"
Modified: code/branches/cpp11/src/modules/jump/JumpPlatform.cc
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpPlatform.cc 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpPlatform.cc 2015-05-17 19:45:02 UTC (rev 10443)
@@ -35,14 +35,10 @@
#include "core/CoreIncludes.h"
#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
-
+#include "core/XMLPort.h"
+#include "sound/WorldSound.h"
#include "JumpFigure.h"
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
-
namespace orxonox
{
RegisterClass(JumpPlatform);
Modified: code/branches/cpp11/src/modules/jump/JumpPlatform.h
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpPlatform.h 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpPlatform.h 2015-05-17 19:45:02 UTC (rev 10443)
@@ -35,8 +35,7 @@
#ifndef _JumpPlatform_H__
#define _JumpPlatform_H__
-#include "jump/JumpPrereqs.h"
-#include "util/Math.h"
+#include "JumpPrereqs.h"
#include "worldentities/MovableEntity.h"
namespace orxonox
Modified: code/branches/cpp11/src/modules/jump/JumpPlatformDisappear.cc
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpPlatformDisappear.cc 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpPlatformDisappear.cc 2015-05-17 19:45:02 UTC (rev 10443)
@@ -34,15 +34,9 @@
#include "JumpPlatformDisappear.h"
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-
-#include "gametypes/Gametype.h"
-
+#include "core/XMLPort.h"
#include "JumpFigure.h"
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
-
namespace orxonox
{
RegisterClass(JumpPlatformDisappear);
Modified: code/branches/cpp11/src/modules/jump/JumpPlatformDisappear.h
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpPlatformDisappear.h 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpPlatformDisappear.h 2015-05-17 19:45:02 UTC (rev 10443)
@@ -35,9 +35,8 @@
#ifndef _JumpPlatformDisappear_H__
#define _JumpPlatformDisappear_H__
-#include "jump/JumpPrereqs.h"
-#include "util/Math.h"
-#include "worldentities/MovableEntity.h"
+#include "JumpPrereqs.h"
+#include "JumpPlatform.h"
namespace orxonox
{
Modified: code/branches/cpp11/src/modules/jump/JumpPlatformFake.cc
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpPlatformFake.cc 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpPlatformFake.cc 2015-05-17 19:45:02 UTC (rev 10443)
@@ -32,11 +32,8 @@
*/
#include "JumpPlatformFake.h"
+
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "gametypes/Gametype.h"
-#include "JumpFigure.h"
-#include "sound/WorldSound.h"
#include "core/XMLPort.h"
namespace orxonox
Modified: code/branches/cpp11/src/modules/jump/JumpPlatformFake.h
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpPlatformFake.h 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpPlatformFake.h 2015-05-17 19:45:02 UTC (rev 10443)
@@ -35,13 +35,9 @@
#ifndef _JumpPlatformFake_H__
#define _JumpPlatformFake_H__
-#include "jump/JumpPrereqs.h"
+#include "JumpPrereqs.h"
+#include "JumpPlatform.h"
-#include "util/Math.h"
-
-#include "worldentities/MovableEntity.h"
-
-
namespace orxonox
{
class _JumpExport JumpPlatformFake : public JumpPlatform
Modified: code/branches/cpp11/src/modules/jump/JumpPlatformHMove.cc
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpPlatformHMove.cc 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpPlatformHMove.cc 2015-05-17 19:45:02 UTC (rev 10443)
@@ -32,12 +32,10 @@
*/
#include "JumpPlatformHMove.h"
+
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "gametypes/Gametype.h"
-#include "JumpFigure.h"
-#include "sound/WorldSound.h"
#include "core/XMLPort.h"
+#include "JumpFigure.h"
namespace orxonox
{
Modified: code/branches/cpp11/src/modules/jump/JumpPlatformHMove.h
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpPlatformHMove.h 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpPlatformHMove.h 2015-05-17 19:45:02 UTC (rev 10443)
@@ -29,13 +29,9 @@
#ifndef _JumpPlatformHMove_H__
#define _JumpPlatformHMove_H__
-#include "jump/JumpPrereqs.h"
+#include "JumpPrereqs.h"
+#include "JumpPlatform.h"
-#include "util/Math.h"
-
-#include "worldentities/MovableEntity.h"
-
-
namespace orxonox
{
Modified: code/branches/cpp11/src/modules/jump/JumpPlatformStatic.cc
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpPlatformStatic.cc 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpPlatformStatic.cc 2015-05-17 19:45:02 UTC (rev 10443)
@@ -32,12 +32,10 @@
*/
#include "JumpPlatformStatic.h"
+
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "gametypes/Gametype.h"
-#include "JumpFigure.h"
-#include "sound/WorldSound.h"
#include "core/XMLPort.h"
+#include "JumpFigure.h"
namespace orxonox
{
Modified: code/branches/cpp11/src/modules/jump/JumpPlatformStatic.h
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpPlatformStatic.h 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpPlatformStatic.h 2015-05-17 19:45:02 UTC (rev 10443)
@@ -29,13 +29,9 @@
#ifndef _JumpPlatformStatic_H__
#define _JumpPlatformStatic_H__
-#include "jump/JumpPrereqs.h"
+#include "JumpPrereqs.h"
+#include "JumpPlatform.h"
-#include "util/Math.h"
-
-#include "worldentities/MovableEntity.h"
-
-
namespace orxonox
{
class _JumpExport JumpPlatformStatic : public JumpPlatform
Modified: code/branches/cpp11/src/modules/jump/JumpPlatformTimer.cc
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpPlatformTimer.cc 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpPlatformTimer.cc 2015-05-17 19:45:02 UTC (rev 10443)
@@ -32,12 +32,11 @@
*/
#include "JumpPlatformTimer.h"
+
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "gametypes/Gametype.h"
-#include "JumpFigure.h"
-#include "sound/WorldSound.h"
#include "core/XMLPort.h"
+#include "graphics/ParticleSpawner.h"
+#include "JumpFigure.h"
namespace orxonox
{
Modified: code/branches/cpp11/src/modules/jump/JumpPlatformTimer.h
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpPlatformTimer.h 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpPlatformTimer.h 2015-05-17 19:45:02 UTC (rev 10443)
@@ -35,14 +35,9 @@
#ifndef _JumpPlatformTimer_H__
#define _JumpPlatformTimer_H__
-#include "jump/JumpPrereqs.h"
+#include "JumpPrereqs.h"
+#include "JumpPlatform.h"
-#include "util/Math.h"
-
-#include "worldentities/MovableEntity.h"
-#include "graphics/ParticleSpawner.h"
-
-
namespace orxonox
{
class _JumpExport JumpPlatformTimer : public JumpPlatform
Modified: code/branches/cpp11/src/modules/jump/JumpPlatformVMove.cc
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpPlatformVMove.cc 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpPlatformVMove.cc 2015-05-17 19:45:02 UTC (rev 10443)
@@ -32,12 +32,10 @@
*/
#include "JumpPlatformVMove.h"
+
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "gametypes/Gametype.h"
-#include "JumpFigure.h"
-#include "sound/WorldSound.h"
#include "core/XMLPort.h"
+#include "JumpFigure.h"
namespace orxonox
{
Modified: code/branches/cpp11/src/modules/jump/JumpPlatformVMove.h
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpPlatformVMove.h 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpPlatformVMove.h 2015-05-17 19:45:02 UTC (rev 10443)
@@ -29,9 +29,8 @@
#ifndef _JumpPlatformVMove_H__
#define _JumpPlatformVMove_H__
-#include "jump/JumpPrereqs.h"
-#include "util/Math.h"
-#include "worldentities/MovableEntity.h"
+#include "JumpPrereqs.h"
+#include "JumpPlatform.h"
namespace orxonox
{
Modified: code/branches/cpp11/src/modules/jump/JumpProjectile.cc
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpProjectile.cc 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpProjectile.cc 2015-05-17 19:45:02 UTC (rev 10443)
@@ -32,13 +32,11 @@
*/
#include "JumpProjectile.h"
+
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
-#include "JumpFigure.h"
-#include "sound/WorldSound.h"
#include "core/XMLPort.h"
+#include "JumpFigure.h"
+#include "JumpEnemy.h"
namespace orxonox
{
Modified: code/branches/cpp11/src/modules/jump/JumpPropeller.cc
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpPropeller.cc 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpPropeller.cc 2015-05-17 19:45:02 UTC (rev 10443)
@@ -34,15 +34,9 @@
#include "JumpPropeller.h"
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
-
+#include "core/XMLPort.h"
#include "JumpFigure.h"
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
-
namespace orxonox
{
RegisterClass(JumpPropeller);
Modified: code/branches/cpp11/src/modules/jump/JumpPropeller.h
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpPropeller.h 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpPropeller.h 2015-05-17 19:45:02 UTC (rev 10443)
@@ -29,13 +29,9 @@
#ifndef _JumpPropeller_H__
#define _JumpPropeller_H__
-#include "jump/JumpPrereqs.h"
+#include "JumpPrereqs.h"
+#include "JumpItem.h"
-#include "util/Math.h"
-
-#include "worldentities/MovableEntity.h"
-
-
namespace orxonox
{
class _JumpExport JumpPropeller : public JumpItem
Modified: code/branches/cpp11/src/modules/jump/JumpRocket.cc
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpRocket.cc 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpRocket.cc 2015-05-17 19:45:02 UTC (rev 10443)
@@ -32,13 +32,10 @@
*/
#include "JumpRocket.h"
+
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
-#include "JumpFigure.h"
-#include "sound/WorldSound.h"
#include "core/XMLPort.h"
+#include "JumpFigure.h"
namespace orxonox
{
Modified: code/branches/cpp11/src/modules/jump/JumpRocket.h
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpRocket.h 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpRocket.h 2015-05-17 19:45:02 UTC (rev 10443)
@@ -29,9 +29,8 @@
#ifndef _JumpRocket_H__
#define _JumpRocket_H__
-#include "jump/JumpPrereqs.h"
-#include "util/Math.h"
-#include "worldentities/MovableEntity.h"
+#include "JumpPrereqs.h"
+#include "JumpItem.h"
namespace orxonox
{
Modified: code/branches/cpp11/src/modules/jump/JumpScore.cc
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpScore.cc 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpScore.cc 2015-05-17 19:45:02 UTC (rev 10443)
@@ -32,12 +32,12 @@
*/
#include "JumpScore.h"
+
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "util/Convert.h"
#include "infos/PlayerInfo.h"
#include "Jump.h"
-#include "sound/WorldSound.h"
namespace orxonox
{
Modified: code/branches/cpp11/src/modules/jump/JumpShield.cc
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpShield.cc 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpShield.cc 2015-05-17 19:45:02 UTC (rev 10443)
@@ -34,15 +34,9 @@
#include "JumpShield.h"
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
-
+#include "core/XMLPort.h"
#include "JumpFigure.h"
-#include "sound/WorldSound.h"
-#include "core/XMLPort.h"
-
namespace orxonox
{
RegisterClass(JumpShield);
Modified: code/branches/cpp11/src/modules/jump/JumpShield.h
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpShield.h 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpShield.h 2015-05-17 19:45:02 UTC (rev 10443)
@@ -29,13 +29,9 @@
#ifndef _JumpShield_H__
#define _JumpShield_H__
-#include "jump/JumpPrereqs.h"
+#include "JumpPrereqs.h"
+#include "JumpItem.h"
-#include "util/Math.h"
-
-#include "worldentities/MovableEntity.h"
-
-
namespace orxonox
{
class _JumpExport JumpShield : public JumpItem
Modified: code/branches/cpp11/src/modules/jump/JumpSpring.cc
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpSpring.cc 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpSpring.cc 2015-05-17 19:45:02 UTC (rev 10443)
@@ -32,13 +32,10 @@
*/
#include "JumpSpring.h"
+
#include "core/CoreIncludes.h"
-#include "core/GameMode.h"
-#include "graphics/Model.h"
-#include "gametypes/Gametype.h"
-#include "JumpFigure.h"
-#include "sound/WorldSound.h"
#include "core/XMLPort.h"
+#include "JumpFigure.h"
namespace orxonox
{
Modified: code/branches/cpp11/src/modules/jump/JumpSpring.h
===================================================================
--- code/branches/cpp11/src/modules/jump/JumpSpring.h 2015-05-14 07:49:10 UTC (rev 10442)
+++ code/branches/cpp11/src/modules/jump/JumpSpring.h 2015-05-17 19:45:02 UTC (rev 10443)
@@ -29,13 +29,9 @@
#ifndef _JumpSpring_H__
#define _JumpSpring_H__
-#include "jump/JumpPrereqs.h"
+#include "JumpPrereqs.h"
+#include "JumpItem.h"
-#include "util/Math.h"
-
-#include "worldentities/MovableEntity.h"
-
-
namespace orxonox
{
class _JumpExport JumpSpring : public JumpItem
More information about the Orxonox-commit
mailing list