[Orxonox-commit 6400] r11057 - in code/branches/cpp11_v3/src: modules/docking modules/dodgerace modules/invader modules/jump modules/mini4dgame modules/objects/triggers modules/overlays/hud modules/tetris modules/towerdefense modules/weapons/munitions orxonox/controllers
landauf at orxonox.net
landauf at orxonox.net
Sun Jan 10 19:50:23 CET 2016
Author: landauf
Date: 2016-01-10 19:50:23 +0100 (Sun, 10 Jan 2016)
New Revision: 11057
Modified:
code/branches/cpp11_v3/src/modules/docking/DockingTarget.cc
code/branches/cpp11_v3/src/modules/docking/DockingTarget.h
code/branches/cpp11_v3/src/modules/dodgerace/DodgeRaceCenterPoint.cc
code/branches/cpp11_v3/src/modules/dodgerace/DodgeRaceCenterPoint.h
code/branches/cpp11_v3/src/modules/invader/InvaderCenterPoint.cc
code/branches/cpp11_v3/src/modules/invader/InvaderCenterPoint.h
code/branches/cpp11_v3/src/modules/jump/JumpBoots.cc
code/branches/cpp11_v3/src/modules/jump/JumpBoots.h
code/branches/cpp11_v3/src/modules/jump/JumpPlatformDisappear.cc
code/branches/cpp11_v3/src/modules/jump/JumpPlatformDisappear.h
code/branches/cpp11_v3/src/modules/jump/JumpPlatformFake.cc
code/branches/cpp11_v3/src/modules/jump/JumpPlatformFake.h
code/branches/cpp11_v3/src/modules/jump/JumpPlatformHMove.cc
code/branches/cpp11_v3/src/modules/jump/JumpPlatformHMove.h
code/branches/cpp11_v3/src/modules/jump/JumpPlatformStatic.cc
code/branches/cpp11_v3/src/modules/jump/JumpPlatformStatic.h
code/branches/cpp11_v3/src/modules/jump/JumpPlatformVMove.cc
code/branches/cpp11_v3/src/modules/jump/JumpPlatformVMove.h
code/branches/cpp11_v3/src/modules/jump/JumpProjectile.cc
code/branches/cpp11_v3/src/modules/jump/JumpProjectile.h
code/branches/cpp11_v3/src/modules/jump/JumpPropeller.cc
code/branches/cpp11_v3/src/modules/jump/JumpPropeller.h
code/branches/cpp11_v3/src/modules/jump/JumpRocket.cc
code/branches/cpp11_v3/src/modules/jump/JumpRocket.h
code/branches/cpp11_v3/src/modules/jump/JumpShield.cc
code/branches/cpp11_v3/src/modules/jump/JumpShield.h
code/branches/cpp11_v3/src/modules/jump/JumpSpring.cc
code/branches/cpp11_v3/src/modules/jump/JumpSpring.h
code/branches/cpp11_v3/src/modules/mini4dgame/Mini4DgameBoard.cc
code/branches/cpp11_v3/src/modules/mini4dgame/Mini4DgameBoard.h
code/branches/cpp11_v3/src/modules/objects/triggers/Trigger.cc
code/branches/cpp11_v3/src/modules/objects/triggers/Trigger.h
code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.cc
code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.h
code/branches/cpp11_v3/src/modules/tetris/TetrisScore.cc
code/branches/cpp11_v3/src/modules/tetris/TetrisScore.h
code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseSelecter.cc
code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseSelecter.h
code/branches/cpp11_v3/src/modules/weapons/munitions/FusionMunition.cc
code/branches/cpp11_v3/src/modules/weapons/munitions/FusionMunition.h
code/branches/cpp11_v3/src/modules/weapons/munitions/GravityBombMunition.cc
code/branches/cpp11_v3/src/modules/weapons/munitions/GravityBombMunition.h
code/branches/cpp11_v3/src/modules/weapons/munitions/IceMunition.cc
code/branches/cpp11_v3/src/modules/weapons/munitions/IceMunition.h
code/branches/cpp11_v3/src/modules/weapons/munitions/LaserMunition.cc
code/branches/cpp11_v3/src/modules/weapons/munitions/LaserMunition.h
code/branches/cpp11_v3/src/modules/weapons/munitions/LightningMunition.cc
code/branches/cpp11_v3/src/modules/weapons/munitions/LightningMunition.h
code/branches/cpp11_v3/src/modules/weapons/munitions/MineMunition.cc
code/branches/cpp11_v3/src/modules/weapons/munitions/MineMunition.h
code/branches/cpp11_v3/src/modules/weapons/munitions/RocketMunition.cc
code/branches/cpp11_v3/src/modules/weapons/munitions/RocketMunition.h
code/branches/cpp11_v3/src/modules/weapons/munitions/SplitMunition.cc
code/branches/cpp11_v3/src/modules/weapons/munitions/SplitMunition.h
code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.cc
code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.h
code/branches/cpp11_v3/src/orxonox/controllers/FightingController.cc
code/branches/cpp11_v3/src/orxonox/controllers/FightingController.h
code/branches/cpp11_v3/src/orxonox/controllers/SectionController.cc
code/branches/cpp11_v3/src/orxonox/controllers/SectionController.h
code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.cc
code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.h
Log:
removed empty XMLPort functions
Modified: code/branches/cpp11_v3/src/modules/docking/DockingTarget.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/docking/DockingTarget.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/docking/DockingTarget.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -33,7 +33,6 @@
#include "DockingTarget.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
namespace orxonox
@@ -48,13 +47,5 @@
DockingTarget::~DockingTarget()
{
}
-
- void DockingTarget::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(DockingTarget, XMLPort, xmlelement, mode);
-
- orxout(verbose, context::docking) << "DockingTarget with name '" << this->getName() << "' created.." << endl;
- }
-
}
Modified: code/branches/cpp11_v3/src/modules/docking/DockingTarget.h
===================================================================
--- code/branches/cpp11_v3/src/modules/docking/DockingTarget.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/docking/DockingTarget.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -57,8 +57,6 @@
DockingTarget(Context* context);
virtual ~DockingTarget();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
-
};
}
Modified: code/branches/cpp11_v3/src/modules/dodgerace/DodgeRaceCenterPoint.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/dodgerace/DodgeRaceCenterPoint.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/dodgerace/DodgeRaceCenterPoint.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -48,11 +48,6 @@
this->checkGametype();
}
- void DodgeRaceCenterPoint::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(DodgeRaceCenterPoint, XMLPort, xmlelement, mode);
- }
-
void DodgeRaceCenterPoint::checkGametype()
{
if (this->getGametype() != nullptr && this->getGametype()->isA(Class(DodgeRace)))
Modified: code/branches/cpp11_v3/src/modules/dodgerace/DodgeRaceCenterPoint.h
===================================================================
--- code/branches/cpp11_v3/src/modules/dodgerace/DodgeRaceCenterPoint.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/dodgerace/DodgeRaceCenterPoint.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -49,8 +49,6 @@
public:
DodgeRaceCenterPoint(Context* context); //checks whether the gametype is actually DodgeRace.
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
-
private:
void checkGametype();
Modified: code/branches/cpp11_v3/src/modules/invader/InvaderCenterPoint.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/invader/InvaderCenterPoint.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/invader/InvaderCenterPoint.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -48,11 +48,6 @@
this->checkGametype();
}
- void InvaderCenterPoint::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(InvaderCenterPoint, XMLPort, xmlelement, mode);
- }
-
void InvaderCenterPoint::checkGametype()
{
if (this->getGametype() != nullptr && this->getGametype()->isA(Class(Invader)))
Modified: code/branches/cpp11_v3/src/modules/invader/InvaderCenterPoint.h
===================================================================
--- code/branches/cpp11_v3/src/modules/invader/InvaderCenterPoint.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/invader/InvaderCenterPoint.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -46,8 +46,6 @@
public:
InvaderCenterPoint(Context* context); //checks whether the gametype is actually Invader.
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
-
private:
void checkGametype();
Modified: code/branches/cpp11_v3/src/modules/jump/JumpBoots.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpBoots.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/jump/JumpBoots.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -34,7 +34,6 @@
#include "JumpBoots.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
#include "JumpFigure.h"
namespace orxonox
@@ -60,11 +59,6 @@
}
- void JumpBoots::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(JumpBoots, XMLPort, xmlelement, mode);
- }
-
void JumpBoots::tick(float dt)
{
SUPER(JumpBoots, tick, dt);
Modified: code/branches/cpp11_v3/src/modules/jump/JumpBoots.h
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpBoots.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/jump/JumpBoots.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -40,7 +40,6 @@
JumpBoots(Context* context);
virtual ~JumpBoots();
virtual void tick(float dt) override;
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
virtual void touchFigure() override;
virtual float getFuelState();
protected:
Modified: code/branches/cpp11_v3/src/modules/jump/JumpPlatformDisappear.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpPlatformDisappear.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/jump/JumpPlatformDisappear.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -34,7 +34,6 @@
#include "JumpPlatformDisappear.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
#include "JumpFigure.h"
namespace orxonox
@@ -53,11 +52,6 @@
}
- void JumpPlatformDisappear::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(JumpPlatformDisappear, XMLPort, xmlelement, mode);
- }
-
void JumpPlatformDisappear::tick(float dt)
{
SUPER(JumpPlatformDisappear, tick, dt);
Modified: code/branches/cpp11_v3/src/modules/jump/JumpPlatformDisappear.h
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpPlatformDisappear.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/jump/JumpPlatformDisappear.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -46,7 +46,6 @@
JumpPlatformDisappear(Context* context);
virtual ~JumpPlatformDisappear();
virtual void tick(float dt) override;
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
virtual void setProperties(bool active);
virtual bool isActive();
virtual void touchFigure() override;
Modified: code/branches/cpp11_v3/src/modules/jump/JumpPlatformFake.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpPlatformFake.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/jump/JumpPlatformFake.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -34,7 +34,6 @@
#include "JumpPlatformFake.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
namespace orxonox
{
@@ -50,11 +49,6 @@
}
- void JumpPlatformFake::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(JumpPlatformFake, XMLPort, xmlelement, mode);
- }
-
void JumpPlatformFake::tick(float dt)
{
SUPER(JumpPlatformFake, tick, dt);
Modified: code/branches/cpp11_v3/src/modules/jump/JumpPlatformFake.h
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpPlatformFake.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/jump/JumpPlatformFake.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -46,7 +46,6 @@
JumpPlatformFake(Context* context);
virtual ~JumpPlatformFake();
virtual void tick(float dt) override;
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
};
}
Modified: code/branches/cpp11_v3/src/modules/jump/JumpPlatformHMove.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpPlatformHMove.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/jump/JumpPlatformHMove.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -34,7 +34,6 @@
#include "JumpPlatformHMove.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
#include "JumpFigure.h"
namespace orxonox
@@ -53,11 +52,6 @@
}
- void JumpPlatformHMove::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(JumpPlatformHMove, XMLPort, xmlelement, mode);
- }
-
void JumpPlatformHMove::tick(float dt)
{
SUPER(JumpPlatformHMove, tick, dt);
Modified: code/branches/cpp11_v3/src/modules/jump/JumpPlatformHMove.h
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpPlatformHMove.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/jump/JumpPlatformHMove.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -41,7 +41,6 @@
JumpPlatformHMove(Context* context);
virtual ~JumpPlatformHMove();
virtual void tick(float dt) override;
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
virtual void setProperties(float leftBoundary, float rightBoundary, float speed);
virtual void touchFigure() override;
Modified: code/branches/cpp11_v3/src/modules/jump/JumpPlatformStatic.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpPlatformStatic.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/jump/JumpPlatformStatic.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -34,7 +34,6 @@
#include "JumpPlatformStatic.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
#include "JumpFigure.h"
namespace orxonox
@@ -52,12 +51,6 @@
}
- //xml port for loading sounds
- void JumpPlatformStatic::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(JumpPlatformStatic, XMLPort, xmlelement, mode);
- }
-
void JumpPlatformStatic::tick(float dt)
{
SUPER(JumpPlatformStatic, tick, dt);
Modified: code/branches/cpp11_v3/src/modules/jump/JumpPlatformStatic.h
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpPlatformStatic.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/jump/JumpPlatformStatic.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -41,7 +41,6 @@
virtual ~JumpPlatformStatic();
virtual void tick(float dt) override;
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
virtual void touchFigure() override;
};
Modified: code/branches/cpp11_v3/src/modules/jump/JumpPlatformVMove.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpPlatformVMove.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/jump/JumpPlatformVMove.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -34,7 +34,6 @@
#include "JumpPlatformVMove.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
#include "JumpFigure.h"
namespace orxonox
@@ -53,11 +52,6 @@
}
- void JumpPlatformVMove::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(JumpPlatformVMove, XMLPort, xmlelement, mode);
- }
-
void JumpPlatformVMove::tick(float dt)
{
SUPER(JumpPlatformVMove, tick, dt);
Modified: code/branches/cpp11_v3/src/modules/jump/JumpPlatformVMove.h
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpPlatformVMove.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/jump/JumpPlatformVMove.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -40,7 +40,6 @@
JumpPlatformVMove(Context* context);
virtual ~JumpPlatformVMove();
virtual void tick(float dt) override;
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
virtual void setProperties(float leftBoundary, float rightBoundary, float speed);
virtual void touchFigure() override;
Modified: code/branches/cpp11_v3/src/modules/jump/JumpProjectile.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpProjectile.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/jump/JumpProjectile.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -34,7 +34,6 @@
#include "JumpProjectile.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
#include "JumpFigure.h"
#include "JumpEnemy.h"
@@ -57,11 +56,6 @@
}
- void JumpProjectile::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(JumpProjectile, XMLPort, xmlelement, mode);
- }
-
void JumpProjectile::tick(float dt)
{
SUPER(JumpProjectile, tick, dt);
Modified: code/branches/cpp11_v3/src/modules/jump/JumpProjectile.h
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpProjectile.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/jump/JumpProjectile.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -44,8 +44,6 @@
virtual void tick(float dt) override;
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
-
void setFieldDimension(float width, float height)
{ this->fieldWidth_ = width; this->fieldHeight_ = height; }
Modified: code/branches/cpp11_v3/src/modules/jump/JumpPropeller.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpPropeller.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/jump/JumpPropeller.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -34,7 +34,6 @@
#include "JumpPropeller.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
#include "JumpFigure.h"
namespace orxonox
@@ -60,11 +59,6 @@
}
- void JumpPropeller::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(JumpPropeller, XMLPort, xmlelement, mode);
- }
-
void JumpPropeller::tick(float dt)
{
SUPER(JumpPropeller, tick, dt);
Modified: code/branches/cpp11_v3/src/modules/jump/JumpPropeller.h
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpPropeller.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/jump/JumpPropeller.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -40,7 +40,6 @@
JumpPropeller(Context* context);
virtual ~JumpPropeller();
virtual void tick(float dt) override;
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
virtual void touchFigure() override;
virtual float getFuelState();
protected:
Modified: code/branches/cpp11_v3/src/modules/jump/JumpRocket.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpRocket.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/jump/JumpRocket.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -34,7 +34,6 @@
#include "JumpRocket.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
#include "JumpFigure.h"
namespace orxonox
@@ -60,11 +59,6 @@
}
- void JumpRocket::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(JumpRocket, XMLPort, xmlelement, mode);
- }
-
void JumpRocket::tick(float dt)
{
SUPER(JumpRocket, tick, dt);
Modified: code/branches/cpp11_v3/src/modules/jump/JumpRocket.h
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpRocket.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/jump/JumpRocket.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -40,7 +40,6 @@
JumpRocket(Context* context);
virtual ~JumpRocket();
virtual void tick(float dt) override;
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
virtual void touchFigure() override;
virtual float getFuelState();
protected:
Modified: code/branches/cpp11_v3/src/modules/jump/JumpShield.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpShield.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/jump/JumpShield.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -34,7 +34,6 @@
#include "JumpShield.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
#include "JumpFigure.h"
namespace orxonox
@@ -60,11 +59,6 @@
}
- void JumpShield::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(JumpShield, XMLPort, xmlelement, mode);
- }
-
void JumpShield::tick(float dt)
{
SUPER(JumpShield, tick, dt);
Modified: code/branches/cpp11_v3/src/modules/jump/JumpShield.h
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpShield.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/jump/JumpShield.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -40,7 +40,6 @@
JumpShield(Context* context);
virtual ~JumpShield();
virtual void tick(float dt) override;
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
virtual void touchFigure() override;
virtual float getFuelState();
protected:
Modified: code/branches/cpp11_v3/src/modules/jump/JumpSpring.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpSpring.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/jump/JumpSpring.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -34,7 +34,6 @@
#include "JumpSpring.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
#include "JumpFigure.h"
namespace orxonox
@@ -59,11 +58,6 @@
}
- void JumpSpring::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(JumpSpring, XMLPort, xmlelement, mode);
- }
-
void JumpSpring::tick(float dt)
{
SUPER(JumpSpring, tick, dt);
Modified: code/branches/cpp11_v3/src/modules/jump/JumpSpring.h
===================================================================
--- code/branches/cpp11_v3/src/modules/jump/JumpSpring.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/jump/JumpSpring.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -40,7 +40,6 @@
JumpSpring(Context* context);
virtual ~JumpSpring();
virtual void tick(float dt) override;
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
virtual void accelerateFigure();
virtual void touchFigure() override;
protected:
Modified: code/branches/cpp11_v3/src/modules/mini4dgame/Mini4DgameBoard.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/mini4dgame/Mini4DgameBoard.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/mini4dgame/Mini4DgameBoard.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -39,8 +39,6 @@
#include "gametypes/Gametype.h"
#include "graphics/BlinkingBillboard.h"
-#include "core/XMLPort.h"
-
#include "Mini4Dgame.h"
namespace orxonox
@@ -72,13 +70,6 @@
this->checkGametype();
}
-
- //xml port for loading sounds
- void Mini4DgameBoard::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(Mini4DgameBoard, XMLPort, xmlelement, mode);
- }
-
/**
@brief checks if the move is valid
@param the position where to put the stone plus the player who makes the move
Modified: code/branches/cpp11_v3/src/modules/mini4dgame/Mini4DgameBoard.h
===================================================================
--- code/branches/cpp11_v3/src/modules/mini4dgame/Mini4DgameBoard.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/mini4dgame/Mini4DgameBoard.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -73,8 +73,6 @@
Mini4DgameBoard(Context* context);
//virtual ~Mini4DgameBoard();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
-
bool isValidMove(const Mini4DgamePosition& move);
void undoMove();
void makeMove(const Mini4DgamePosition& move);
Modified: code/branches/cpp11_v3/src/modules/objects/triggers/Trigger.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/objects/triggers/Trigger.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/objects/triggers/Trigger.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -36,7 +36,6 @@
#include "core/CoreIncludes.h"
#include "core/GameMode.h"
-#include "core/XMLPort.h"
#include "core/command/ConsoleCommandIncludes.h"
#include "Scene.h"
@@ -89,16 +88,7 @@
/**
@brief
- Method for creating a Trigger object through XML.
- */
- void Trigger::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(Trigger, XMLPort, xmlelement, mode);
- }
- /**
- @brief
-
@param dt
The time elapsed since last tick.
*/
Modified: code/branches/cpp11_v3/src/modules/objects/triggers/Trigger.h
===================================================================
--- code/branches/cpp11_v3/src/modules/objects/triggers/Trigger.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/objects/triggers/Trigger.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -82,7 +82,6 @@
Trigger(Context* context); // Constructor. Registers and initializes the object.
virtual ~Trigger();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); // Method for creating a Trigger object through XML.
virtual void tick(float dt);
/**
Modified: code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -28,9 +28,9 @@
#include "HUDWeaponMode.h"
-#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
#include "util/Convert.h"
+#include "util/StringUtils.h"
+#include "core/CoreIncludes.h"
#include "core/class/Super.h"
namespace orxonox
@@ -106,11 +106,6 @@
}
}
- void HUDWeaponMode::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(HUDWeaponMode, XMLPort, xmlelement, mode);
- }
-
void HUDWeaponMode::tick(float dt)
{
SUPER(HUDWeaponMode, tick, dt);
Modified: code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.h
===================================================================
--- code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/overlays/hud/HUDWeaponMode.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -57,7 +57,6 @@
virtual ~HUDWeaponMode();
virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
virtual void changedOwner();
virtual void changedOverlayGroup();
virtual void changedVisibility();
Modified: code/branches/cpp11_v3/src/modules/tetris/TetrisScore.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/tetris/TetrisScore.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/tetris/TetrisScore.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -35,7 +35,6 @@
#include "TetrisScore.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
#include "util/Convert.h"
#include "infos/PlayerInfo.h"
@@ -69,15 +68,6 @@
/**
@brief
- Method to create a TetrisScore through XML.
- */
- void TetrisScore::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(TetrisScore, XMLPort, xmlelement, mode);
- }
-
- /**
- @brief
Is called each tick.
Creates and sets the caption to be displayed by the TetrisScore.
@param dt
Modified: code/branches/cpp11_v3/src/modules/tetris/TetrisScore.h
===================================================================
--- code/branches/cpp11_v3/src/modules/tetris/TetrisScore.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/tetris/TetrisScore.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -60,7 +60,6 @@
virtual ~TetrisScore();
virtual void tick(float dt) override; //!< Creates and sets the caption to be displayed by the TetrisScore.
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
virtual void changedOwner() override; //!< Is called when the owner changes.
private:
Modified: code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseSelecter.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseSelecter.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseSelecter.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -34,7 +34,6 @@
#include "TowerDefenseSelecter.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
#include "graphics/Model.h"
namespace orxonox
@@ -60,11 +59,6 @@
}
- void TowerDefenseSelecter::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(TowerDefenseSelecter, XMLPort, xmlelement, mode);
- }
-
void TowerDefenseSelecter::tick(float dt)
{
SUPER(TowerDefenseSelecter, tick, dt);
Modified: code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseSelecter.h
===================================================================
--- code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseSelecter.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseSelecter.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -40,7 +40,6 @@
public:
TowerDefenseSelecter(Context* context); //!< Constructor. Registers and initializes the object.
virtual ~TowerDefenseSelecter();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
virtual void tick(float dt) override;
virtual void moveFrontBack(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
virtual void moveRightLeft(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
Modified: code/branches/cpp11_v3/src/modules/weapons/munitions/FusionMunition.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/weapons/munitions/FusionMunition.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/weapons/munitions/FusionMunition.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -33,7 +33,6 @@
#include "FusionMunition.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
namespace orxonox
{
@@ -56,9 +55,4 @@
this->reloadTime_ = 0.5f;
}
-
- void FusionMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(FusionMunition, XMLPort, xmlelement, mode);
- }
}
Modified: code/branches/cpp11_v3/src/modules/weapons/munitions/FusionMunition.h
===================================================================
--- code/branches/cpp11_v3/src/modules/weapons/munitions/FusionMunition.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/weapons/munitions/FusionMunition.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -52,7 +52,6 @@
public:
FusionMunition(Context* context);
virtual ~FusionMunition() {}
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
};
}
Modified: code/branches/cpp11_v3/src/modules/weapons/munitions/GravityBombMunition.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/weapons/munitions/GravityBombMunition.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/weapons/munitions/GravityBombMunition.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -6,7 +6,6 @@
*/
#include "GravityBombMunition.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
namespace orxonox
{
@@ -26,11 +25,6 @@
this->reloadTime_ = 0.0f;
}
-
- void GravityBombMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(GravityBombMunition, XMLPort, xmlelement, mode);
- }
}
Modified: code/branches/cpp11_v3/src/modules/weapons/munitions/GravityBombMunition.h
===================================================================
--- code/branches/cpp11_v3/src/modules/weapons/munitions/GravityBombMunition.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/weapons/munitions/GravityBombMunition.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -27,7 +27,6 @@
public:
GravityBombMunition(Context* context);
virtual ~GravityBombMunition() {}
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
};
}
Modified: code/branches/cpp11_v3/src/modules/weapons/munitions/IceMunition.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/weapons/munitions/IceMunition.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/weapons/munitions/IceMunition.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -33,7 +33,6 @@
#include "IceMunition.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
namespace orxonox
{
@@ -54,9 +53,4 @@
this->reloadTime_ = 0.5f;
}
-
- void IceMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(IceMunition, XMLPort, xmlelement, mode);
- }
}
Modified: code/branches/cpp11_v3/src/modules/weapons/munitions/IceMunition.h
===================================================================
--- code/branches/cpp11_v3/src/modules/weapons/munitions/IceMunition.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/weapons/munitions/IceMunition.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -52,7 +52,6 @@
public:
IceMunition(Context* context);
virtual ~IceMunition() {}
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
};
}
Modified: code/branches/cpp11_v3/src/modules/weapons/munitions/LaserMunition.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/weapons/munitions/LaserMunition.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/weapons/munitions/LaserMunition.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -33,7 +33,6 @@
#include "LaserMunition.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
namespace orxonox
{
@@ -57,9 +56,4 @@
this->reloadTime_ = 0.5f;
}
-
- void LaserMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(LaserMunition, XMLPort, xmlelement, mode);
- }
}
Modified: code/branches/cpp11_v3/src/modules/weapons/munitions/LaserMunition.h
===================================================================
--- code/branches/cpp11_v3/src/modules/weapons/munitions/LaserMunition.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/weapons/munitions/LaserMunition.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -52,7 +52,6 @@
public:
LaserMunition(Context* context);
virtual ~LaserMunition() {}
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
};
}
Modified: code/branches/cpp11_v3/src/modules/weapons/munitions/LightningMunition.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/weapons/munitions/LightningMunition.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/weapons/munitions/LightningMunition.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -33,7 +33,6 @@
#include "LightningMunition.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
namespace orxonox
{
@@ -54,9 +53,4 @@
this->reloadTime_ = 0.5f;
}
-
- void LightningMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(LightningMunition, XMLPort, xmlelement, mode);
- }
}
Modified: code/branches/cpp11_v3/src/modules/weapons/munitions/LightningMunition.h
===================================================================
--- code/branches/cpp11_v3/src/modules/weapons/munitions/LightningMunition.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/weapons/munitions/LightningMunition.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -52,7 +52,6 @@
public:
LightningMunition(Context* context);
virtual ~LightningMunition() {}
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
};
}
Modified: code/branches/cpp11_v3/src/modules/weapons/munitions/MineMunition.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/weapons/munitions/MineMunition.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/weapons/munitions/MineMunition.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -53,9 +53,4 @@
this->reloadTime_ = 0.5f;
}
-
- void MineMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(MineMunition, XMLPort, xmlelement, mode);
- }
-}
\ No newline at end of file
+}
Modified: code/branches/cpp11_v3/src/modules/weapons/munitions/MineMunition.h
===================================================================
--- code/branches/cpp11_v3/src/modules/weapons/munitions/MineMunition.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/weapons/munitions/MineMunition.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -52,7 +52,6 @@
public:
MineMunition(Context* context);
virtual ~MineMunition() {}
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
};
}
Modified: code/branches/cpp11_v3/src/modules/weapons/munitions/RocketMunition.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/weapons/munitions/RocketMunition.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/weapons/munitions/RocketMunition.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -33,7 +33,6 @@
#include "RocketMunition.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
namespace orxonox
{
@@ -54,9 +53,4 @@
this->reloadTime_ = 0.5f;
}
-
- void RocketMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(RocketMunition, XMLPort, xmlelement, mode);
- }
}
Modified: code/branches/cpp11_v3/src/modules/weapons/munitions/RocketMunition.h
===================================================================
--- code/branches/cpp11_v3/src/modules/weapons/munitions/RocketMunition.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/weapons/munitions/RocketMunition.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -52,7 +52,6 @@
public:
RocketMunition(Context* context);
virtual ~RocketMunition() {}
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
};
}
Modified: code/branches/cpp11_v3/src/modules/weapons/munitions/SplitMunition.cc
===================================================================
--- code/branches/cpp11_v3/src/modules/weapons/munitions/SplitMunition.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/weapons/munitions/SplitMunition.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -33,7 +33,6 @@
#include "SplitMunition.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
namespace orxonox
{
@@ -54,9 +53,4 @@
this->reloadTime_ = 0.5f;
}
-
- void SplitMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(SplitMunition, XMLPort, xmlelement, mode);
- }
}
Modified: code/branches/cpp11_v3/src/modules/weapons/munitions/SplitMunition.h
===================================================================
--- code/branches/cpp11_v3/src/modules/weapons/munitions/SplitMunition.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/modules/weapons/munitions/SplitMunition.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -52,7 +52,6 @@
public:
SplitMunition(Context* context);
virtual ~SplitMunition() {}
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
};
}
Modified: code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.cc
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -54,12 +54,6 @@
this->parsedActionpoints_.clear();
this->actionpoints_.clear();
}
-
- void DivisionController::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(DivisionController, XMLPort, xmlelement, mode);
-
- }
void DivisionController::tick(float dt)
{
if (!this->isActive())
Modified: code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.h
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -51,8 +51,6 @@
//----[orxonox demanded functions]----
virtual void tick(float dt);
-
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
//----[orxonox demanded functions]----
//----[own functions]----
Modified: code/branches/cpp11_v3/src/orxonox/controllers/FightingController.cc
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/FightingController.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/orxonox/controllers/FightingController.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -26,7 +26,6 @@
*
*/
#include "controllers/FightingController.h"
-#include "core/XMLPort.h"
#include "util/Math.h"
@@ -56,10 +55,6 @@
{
}
- void FightingController::XMLPort( Element& xmlelement, XMLPort::Mode mode )
- {
- SUPER( FightingController, XMLPort, xmlelement, mode );
- }
void FightingController::lookAtTarget(float dt)
{
if (!this || !this->getControllableEntity())
Modified: code/branches/cpp11_v3/src/orxonox/controllers/FightingController.h
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/FightingController.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/orxonox/controllers/FightingController.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -49,8 +49,6 @@
FightingController(Context* context);
virtual ~FightingController();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-
float squaredDistanceToTarget() const;
bool isLookingAtTarget(float angle) const;
bool hasTarget() const;
Modified: code/branches/cpp11_v3/src/orxonox/controllers/SectionController.cc
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/SectionController.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/orxonox/controllers/SectionController.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -55,10 +55,6 @@
this->parsedActionpoints_.clear();
this->actionpoints_.clear();
}
- void SectionController::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(SectionController, XMLPort, xmlelement, mode);
- }
//----in tick, move (or look) and shoot----
void SectionController::tick(float dt)
Modified: code/branches/cpp11_v3/src/orxonox/controllers/SectionController.h
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/SectionController.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/orxonox/controllers/SectionController.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -50,8 +50,6 @@
//----[orxonox demanded functions]----
virtual void tick(float dt);
-
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
//----[/orxonox demanded functions]----
//----[own functions]----
Modified: code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.cc
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.cc 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.cc 2016-01-10 18:50:23 UTC (rev 11057)
@@ -54,11 +54,6 @@
this->actionpoints_.clear();
}
- void WingmanController::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(WingmanController, XMLPort, xmlelement, mode);
- }
-
//----in tick, move (or look) and shoot----
void WingmanController::tick(float dt)
{
Modified: code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.h
===================================================================
--- code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.h 2016-01-10 17:35:40 UTC (rev 11056)
+++ code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.h 2016-01-10 18:50:23 UTC (rev 11057)
@@ -50,8 +50,6 @@
//----[/language demanded functions]----
//----[orxonox demanded functions]----
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-
virtual void tick(float dt);
virtual bool hasWingman()
{ return false; }
More information about the Orxonox-commit
mailing list