[Orxonox-commit 6187] r10845 - in code/branches/cpp11_v2/src: libraries/core libraries/core/command libraries/core/config libraries/core/input libraries/core/object libraries/core/singleton libraries/network libraries/network/packet libraries/tools libraries/util modules/designtools modules/gametypes modules/objects modules/overlays/hud modules/portals orxonox orxonox/chat orxonox/collisionshapes orxonox/gamestates orxonox/gametypes orxonox/graphics orxonox/infos orxonox/interfaces orxonox/overlays orxonox/sound orxonox/worldentities orxonox/worldentities/pawns
landauf at orxonox.net
landauf at orxonox.net
Mon Nov 23 22:20:29 CET 2015
Author: landauf
Date: 2015-11-23 22:20:29 +0100 (Mon, 23 Nov 2015)
New Revision: 10845
Modified:
code/branches/cpp11_v2/src/libraries/core/BaseObject.h
code/branches/cpp11_v2/src/libraries/core/GUIManager.cc
code/branches/cpp11_v2/src/libraries/core/GUIManager.h
code/branches/cpp11_v2/src/libraries/core/Game.h
code/branches/cpp11_v2/src/libraries/core/GraphicsManager.cc
code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h
code/branches/cpp11_v2/src/libraries/core/XMLPort.h
code/branches/cpp11_v2/src/libraries/core/command/Functor.h
code/branches/cpp11_v2/src/libraries/core/command/IOConsolePOSIX.h
code/branches/cpp11_v2/src/libraries/core/command/IOConsoleWindows.h
code/branches/cpp11_v2/src/libraries/core/command/Shell.h
code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryComment.h
code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryValue.h
code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryVectorValue.h
code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.h
code/branches/cpp11_v2/src/libraries/core/config/SettingsConfigFile.h
code/branches/cpp11_v2/src/libraries/core/input/HalfAxis.h
code/branches/cpp11_v2/src/libraries/core/input/InputBuffer.h
code/branches/cpp11_v2/src/libraries/core/input/InputCommands.h
code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h
code/branches/cpp11_v2/src/libraries/core/input/InputManager.h
code/branches/cpp11_v2/src/libraries/core/input/InputState.h
code/branches/cpp11_v2/src/libraries/core/input/JoyStick.h
code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h
code/branches/cpp11_v2/src/libraries/core/input/KeyDetector.h
code/branches/cpp11_v2/src/libraries/core/input/Keyboard.h
code/branches/cpp11_v2/src/libraries/core/input/Mouse.h
code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h
code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonWrapper.h
code/branches/cpp11_v2/src/libraries/network/Client.h
code/branches/cpp11_v2/src/libraries/network/NetworkFunction.h
code/branches/cpp11_v2/src/libraries/network/Server.h
code/branches/cpp11_v2/src/libraries/network/packet/Acknowledgement.h
code/branches/cpp11_v2/src/libraries/network/packet/Chat.h
code/branches/cpp11_v2/src/libraries/network/packet/ClassID.h
code/branches/cpp11_v2/src/libraries/network/packet/DeleteObjects.h
code/branches/cpp11_v2/src/libraries/network/packet/FunctionCalls.h
code/branches/cpp11_v2/src/libraries/network/packet/Welcome.h
code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h
code/branches/cpp11_v2/src/libraries/util/MultiType.h
code/branches/cpp11_v2/src/libraries/util/MultiTypeValue.h
code/branches/cpp11_v2/src/modules/designtools/CreateStars.h
code/branches/cpp11_v2/src/modules/designtools/SkyboxGenerator.h
code/branches/cpp11_v2/src/modules/gametypes/OldRaceCheckPoint.h
code/branches/cpp11_v2/src/modules/gametypes/RaceCheckPoint.h
code/branches/cpp11_v2/src/modules/gametypes/SpaceRace.h
code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.h
code/branches/cpp11_v2/src/modules/objects/Attacher.h
code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.h
code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.h
code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.h
code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.h
code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.h
code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.h
code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.h
code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.h
code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.h
code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.h
code/branches/cpp11_v2/src/orxonox/PlayerManager.h
code/branches/cpp11_v2/src/orxonox/Scene.h
code/branches/cpp11_v2/src/orxonox/chat/ChatInputHandler.h
code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.h
code/branches/cpp11_v2/src/orxonox/collisionshapes/WorldEntityCollisionShape.h
code/branches/cpp11_v2/src/orxonox/gamestates/GSClient.h
code/branches/cpp11_v2/src/orxonox/gamestates/GSGraphics.h
code/branches/cpp11_v2/src/orxonox/gamestates/GSLevel.h
code/branches/cpp11_v2/src/orxonox/gamestates/GSMainMenu.h
code/branches/cpp11_v2/src/orxonox/gamestates/GSMasterServer.h
code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.h
code/branches/cpp11_v2/src/orxonox/gamestates/GSServer.h
code/branches/cpp11_v2/src/orxonox/gamestates/GSStandalone.h
code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.h
code/branches/cpp11_v2/src/orxonox/gametypes/LastManStanding.h
code/branches/cpp11_v2/src/orxonox/gametypes/LastTeamStanding.h
code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.h
code/branches/cpp11_v2/src/orxonox/graphics/Camera.h
code/branches/cpp11_v2/src/orxonox/infos/Bot.h
code/branches/cpp11_v2/src/orxonox/infos/HumanPlayer.h
code/branches/cpp11_v2/src/orxonox/interfaces/PickupCarrier.h
code/branches/cpp11_v2/src/orxonox/overlays/GUISheet.h
code/branches/cpp11_v2/src/orxonox/overlays/InGameConsole.h
code/branches/cpp11_v2/src/orxonox/overlays/OrxonoxOverlay.h
code/branches/cpp11_v2/src/orxonox/sound/AmbientSound.h
code/branches/cpp11_v2/src/orxonox/sound/SoundManager.h
code/branches/cpp11_v2/src/orxonox/sound/WorldAmbientSound.h
code/branches/cpp11_v2/src/orxonox/sound/WorldSound.h
code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.h
code/branches/cpp11_v2/src/orxonox/worldentities/MobileEntity.h
code/branches/cpp11_v2/src/orxonox/worldentities/MovableEntity.h
code/branches/cpp11_v2/src/orxonox/worldentities/StaticEntity.h
code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.h
Log:
always use 'virtual' in the declaration of virtual functions even if they are inherited
Modified: code/branches/cpp11_v2/src/libraries/core/BaseObject.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/BaseObject.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/BaseObject.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -162,7 +162,7 @@
inline void setScene(const StrongOrWeakPtr<Scene>& scene, uint32_t sceneID) { this->scene_ = scene; this->sceneID_=sceneID; }
inline Scene* getScene() const { return this->scene_.get(); }
- inline virtual uint32_t getSceneID() const { return this->sceneID_; }
+ virtual inline uint32_t getSceneID() const { return this->sceneID_; }
inline void setGametype(const StrongOrWeakPtr<Gametype>& gametype) { this->gametype_ = gametype; }
inline Gametype* getGametype() const { return this->gametype_.get(); }
Modified: code/branches/cpp11_v2/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/GUIManager.cc 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/GUIManager.cc 2015-11-23 21:20:29 UTC (rev 10845)
@@ -123,7 +123,7 @@
class CEGUILogger : public CEGUI::DefaultLogger
{
public:
- void logEvent(const CEGUI::String& message, CEGUI::LoggingLevel level = CEGUI::Standard) override
+ virtual void logEvent(const CEGUI::String& message, CEGUI::LoggingLevel level = CEGUI::Standard) override
{
OutputLevel orxonoxLevel = level::debug_output;
switch (level)
@@ -142,7 +142,7 @@
}
/// Carbon copy from CEGUIDefaultLogger.cpp with a bugfix for Windows
- void setLogFilename(const CEGUI::String& filename, bool append = false) override
+ virtual void setLogFilename(const CEGUI::String& filename, bool append = false) override
{
// Close current log file (if any)
if (d_ostream.is_open())
@@ -227,7 +227,7 @@
{
public:
/// Callback from Ogre invoked before other stuff in our target queue is rendered
- void renderQueueStarted(Ogre::uint8 id, const Ogre::String& invocation, bool& skipThisQueue) override
+ virtual void renderQueueStarted(Ogre::uint8 id, const Ogre::String& invocation, bool& skipThisQueue) override
{
if (id == Ogre::RENDER_QUEUE_OVERLAY && invocation.empty())
{
Modified: code/branches/cpp11_v2/src/libraries/core/GUIManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/GUIManager.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/GUIManager.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -168,14 +168,14 @@
void changedCeguiOutputLevel();
// keyHandler functions
- void buttonPressed (const KeyEvent& evt) override;
- void buttonReleased(const KeyEvent& evt) override;
+ virtual void buttonPressed (const KeyEvent& evt) override;
+ virtual void buttonReleased(const KeyEvent& evt) override;
// mouseHandler functions
- void buttonPressed (MouseButtonCode::ByEnum id) override;
- void buttonReleased(MouseButtonCode::ByEnum id) override;
- void mouseMoved (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) override;
- void mouseScrolled (int abs, int rel) override;
+ virtual void buttonPressed (MouseButtonCode::ByEnum id) override;
+ virtual void buttonReleased(MouseButtonCode::ByEnum id) override;
+ virtual void mouseMoved (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) override;
+ virtual void mouseScrolled (int abs, int rel) override;
void mouseLeft ();
// window event handler
Modified: code/branches/cpp11_v2/src/libraries/core/Game.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Game.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/Game.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -134,7 +134,7 @@
class TemplateGameStateFactory : public GameStateFactory
{
public:
- std::shared_ptr<GameState> fabricateInternal(const GameStateInfo& info) override
+ virtual std::shared_ptr<GameState> fabricateInternal(const GameStateInfo& info) override
{ return std::shared_ptr<GameState>(std::make_shared<T>(info)); }
};
Modified: code/branches/cpp11_v2/src/libraries/core/GraphicsManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/GraphicsManager.cc 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/GraphicsManager.cc 2015-11-23 21:20:29 UTC (rev 10845)
@@ -81,13 +81,13 @@
class OgreWindowEventListener : public Ogre::WindowEventListener
{
public:
- void windowResized (Ogre::RenderWindow* rw) override
+ virtual void windowResized (Ogre::RenderWindow* rw) override
{ orxonox::WindowEventListener::resizeWindow(rw->getWidth(), rw->getHeight()); }
- void windowFocusChange (Ogre::RenderWindow* rw) override
+ virtual void windowFocusChange (Ogre::RenderWindow* rw) override
{ orxonox::WindowEventListener::changeWindowFocus(rw->isActive()); }
- void windowClosed (Ogre::RenderWindow* rw) override
+ virtual void windowClosed (Ogre::RenderWindow* rw) override
{ orxonox::Game::getInstance().stop(); }
- void windowMoved (Ogre::RenderWindow* rw) override
+ virtual void windowMoved (Ogre::RenderWindow* rw) override
{ orxonox::WindowEventListener::moveWindow(); }
};
Modified: code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -110,9 +110,9 @@
// event from Ogre::LogListener
#if OGRE_VERSION >= 0x010800
- void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName, bool& skipThisMessage) override;
+ virtual void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName, bool& skipThisMessage) override;
#else
- void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName);
+ virtual void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName) override;
#endif
// console commands
Modified: code/branches/cpp11_v2/src/libraries/core/XMLPort.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/XMLPort.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/XMLPort.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -555,7 +555,7 @@
{
}
- void callLoadExecutor(BaseObject* object, BaseObject* newObject) override
+ virtual void callLoadExecutor(BaseObject* object, BaseObject* newObject) override
{
T* castObject = orxonox_cast<T*>(object);
assert(castObject);
Modified: code/branches/cpp11_v2/src/libraries/core/command/Functor.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/Functor.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/command/Functor.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -248,7 +248,7 @@
virtual MultiType operator()(O* object, const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null) = 0;
// see Functor::operator()()
- MultiType operator()(const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null) override
+ virtual MultiType operator()(const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null) override
{
// call the function if an object was assigned
if (this->object_)
@@ -261,7 +261,7 @@
}
// see Functor::getType()
- inline Functor::Type::Enum getType() const override
+ virtual inline Functor::Type::Enum getType() const override
{ return Functor::Type::Member; }
/// Assigns an object-pointer to the functor which is used to execute a member-function.
@@ -279,14 +279,14 @@
{ return this->object_; }
// see Functor::setRawObjectPointer()
- inline void setRawObjectPointer(void* object) override
+ virtual inline void setRawObjectPointer(void* object) override
{ this->setObject((O*)object); }
// see Functor::getRawObjectPointer()
- inline void* getRawObjectPointer() const override
+ virtual inline void* getRawObjectPointer() const override
{ return this->object_; }
// see Functor::setSafeMode()
- inline void setSafeMode(bool bSafeMode) override
+ virtual inline void setSafeMode(bool bSafeMode) override
{
if (bSafeMode == this->bSafeMode_)
return;
@@ -308,7 +308,7 @@
{ Destroyable* base = dynamic_cast<Destroyable*>(object); if (base) { this->unregisterAsDestructionListener(base); } }
/// Will be called by Destroyable::~Destroyable() if the stored object is deleted and the Functor is in safe mode.
- inline void objectDeleted() override
+ virtual inline void objectDeleted() override
{ this->object_ = nullptr; }
O* object_; ///< The stored object-pointer, used to execute a member-function (or nullptr for static functions)
@@ -327,24 +327,24 @@
virtual MultiType operator()(void* object, const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null) = 0;
// see Functor::operator()()
- MultiType operator()(const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null) override
+ virtual MultiType operator()(const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null) override
{
return (*this)((void*)nullptr, param1, param2, param3, param4, param5);
}
// see Functor::getType()
- inline Functor::Type::Enum getType() const override
+ virtual inline Functor::Type::Enum getType() const override
{ return Functor::Type::Static; }
// see Functor::setRawObjectPointer()
- inline void setRawObjectPointer(void*) override
+ virtual inline void setRawObjectPointer(void*) override
{ orxout(internal_warning) << "Can't assign an object pointer to a static functor" << endl; }
// see Functor::getRawObjectPointer()
- inline void* getRawObjectPointer() const override
+ virtual inline void* getRawObjectPointer() const override
{ return nullptr; }
// see Functor::setSafeMode()
- inline void setSafeMode(bool) override {}
+ virtual inline void setSafeMode(bool) override {}
};
/// FunctorStatic is just a typedef of FunctorMember with @a T = void.
Modified: code/branches/cpp11_v2/src/libraries/core/command/IOConsolePOSIX.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/IOConsolePOSIX.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/command/IOConsolePOSIX.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -64,12 +64,12 @@
static int extractLogLevel(std::string* text);
// Methods from ShellListener
- void linesChanged() override;
- void lineAdded() override;
- void inputChanged() override;
- void cursorChanged() override;
- void executed() override;
- void exit() override;
+ virtual void linesChanged() override;
+ virtual void lineAdded() override;
+ virtual void inputChanged() override;
+ virtual void cursorChanged() override;
+ virtual void executed() override;
+ virtual void exit() override;
bool willPrintStatusLines();
void printInputLine();
Modified: code/branches/cpp11_v2/src/libraries/core/command/IOConsoleWindows.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/IOConsoleWindows.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/command/IOConsoleWindows.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -66,12 +66,12 @@
static int extractLogLevel(std::string* text);
// Methods from ShellListener
- void linesChanged() override;
- void lineAdded() override;
- void inputChanged() override;
- void cursorChanged() override;
- void executed() override;
- void exit() override;
+ virtual void linesChanged() override;
+ virtual void lineAdded() override;
+ virtual void inputChanged() override;
+ virtual void cursorChanged() override;
+ virtual void executed() override;
+ virtual void exit() override;
void resetTerminalMode();
void moveCursor(int dx, int dy);
Modified: code/branches/cpp11_v2/src/libraries/core/command/Shell.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/Shell.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/command/Shell.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -150,7 +150,7 @@
Shell(const Shell& other);
// DevModeListener
- void devModeChanged(bool value) override;
+ virtual void devModeChanged(bool value) override;
void addToHistory(const std::string& command);
const std::string& getFromHistory() const;
Modified: code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryComment.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryComment.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryComment.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -53,23 +53,23 @@
inline ConfigFileEntryComment(const std::string& comment) : comment_(comment) {}
/// Destructor
- inline virtual ~ConfigFileEntryComment() {}
+ virtual inline ~ConfigFileEntryComment() {}
- inline virtual const std::string& getName() const override
+ virtual inline const std::string& getName() const override
{ return this->comment_; }
- inline virtual void setComment(const std::string& comment) override
+ virtual inline void setComment(const std::string& comment) override
{ this->comment_ = comment; }
- inline virtual void setValue(const std::string& value) override
+ virtual inline void setValue(const std::string& value) override
{}
- inline virtual const std::string& getValue() const override
+ virtual inline const std::string& getValue() const override
{ return BLANKSTRING; }
- inline void setString(bool bString) override
+ virtual inline void setString(bool bString) override
{}
- inline virtual const std::string& getFileEntry() const override
+ virtual inline const std::string& getFileEntry() const override
{ return this->comment_; }
private:
Modified: code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryValue.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryValue.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryValue.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -66,27 +66,27 @@
{ this->update(); }
/// Destructor
- inline virtual ~ConfigFileEntryValue() {}
+ virtual inline ~ConfigFileEntryValue() {}
- inline virtual const std::string& getName() const override
+ virtual inline const std::string& getName() const override
{ return this->name_; }
- inline virtual void setComment(const std::string& comment) override
+ virtual inline void setComment(const std::string& comment) override
{ this->additionalComment_ = comment; this->update(); }
- inline virtual void setValue(const std::string& value) override
+ virtual inline void setValue(const std::string& value) override
{ this->value_ = value; this->update(); }
- inline virtual const std::string& getValue() const override
+ virtual inline const std::string& getValue() const override
{ return this->value_; }
- inline void virtual setString(bool bString) override
+ virtual inline void setString(bool bString) override
{ this->bString_ = bString; this->update(); }
- inline virtual const std::string& getFileEntry() const override
+ virtual inline const std::string& getFileEntry() const override
{ return this->fileEntry_; }
/// Returns the "key" of the value (in this case it's just the name of the entry, but for vectors it's different)
- inline virtual const std::string& getKeyString() const
+ virtual inline const std::string& getKeyString() const
{ return this->name_; }
protected:
Modified: code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryVectorValue.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryVectorValue.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryVectorValue.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -66,15 +66,15 @@
/// Destructor
inline ~ConfigFileEntryVectorValue() {}
- inline unsigned int getIndex() const override
+ virtual inline unsigned int getIndex() const override
{ return this->index_; }
/// Returns the "key" of the value (the name of the vector plus the index of the element)
- inline const std::string& getKeyString() const override
+ virtual inline const std::string& getKeyString() const override
{ return this->keyString_; }
private:
- void update() override;
+ virtual void update() override;
unsigned int index_; ///< The index of the element in the vector
std::string keyString_; ///< The full name of the entry (the name of the vector plus the index of the element)
Modified: code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -58,7 +58,7 @@
{
public:
virtual void call(void* object) = 0;
- inline virtual ~ConfigValueCallbackBase() {}
+ virtual inline ~ConfigValueCallbackBase() {}
};
template <class T>
@@ -66,8 +66,8 @@
{
public:
inline ConfigValueCallback(void (T::*function) (void)) : function_(function) {}
- inline virtual ~ConfigValueCallback() {}
- inline virtual void call(void* object) override
+ virtual inline ~ConfigValueCallback() {}
+ virtual inline void call(void* object) override
{
if (!IdentifierManager::getInstance().isCreatingHierarchy())
(static_cast<T*>(object)->*this->function_)();
Modified: code/branches/cpp11_v2/src/libraries/core/config/SettingsConfigFile.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/config/SettingsConfigFile.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/config/SettingsConfigFile.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -67,7 +67,7 @@
SettingsConfigFile(const std::string& filename);
~SettingsConfigFile();
- void load() override; // tolua_export
+ virtual void load() override; // tolua_export
void setFilename(const std::string& filename); // tolua_export
void clean(bool bCleanComments = false); // tolua_export
Modified: code/branches/cpp11_v2/src/libraries/core/input/HalfAxis.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/HalfAxis.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/input/HalfAxis.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -55,8 +55,8 @@
{ }
using Button::execute;
bool execute();
- bool addParamCommand(ParamCommand* command) override;
- void clear() override;
+ virtual bool addParamCommand(ParamCommand* command) override;
+ virtual void clear() override;
void reset();
// axis related
Modified: code/branches/cpp11_v2/src/libraries/core/input/InputBuffer.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/InputBuffer.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/input/InputBuffer.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -65,7 +65,7 @@
listener_(listener), function_(function)
{ }
virtual ~InputBufferListenerTuple() { }
- void callFunction() override
+ virtual void callFunction() override
{
(listener_->*function_)();
}
@@ -164,15 +164,15 @@
inline void decreaseCursor()
{ if (this->cursor_ > 0) { --this->cursor_; } }
- void buttonPressed(const KeyEvent& evt) override;
+ virtual void buttonPressed(const KeyEvent& evt) override;
private:
bool charIsAllowed(const char& input);
- void buttonHeld (const KeyEvent& evt) override;
- void processKey (const KeyEvent& evt);
+ virtual void buttonHeld (const KeyEvent& evt) override;
+ void processKey (const KeyEvent& evt);
- void keyboardUpdated(float dt) override;
+ virtual void keyboardUpdated(float dt) override;
std::string buffer_;
std::list<BaseInputBufferListenerTuple*> listeners_;
Modified: code/branches/cpp11_v2/src/libraries/core/input/InputCommands.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/InputCommands.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/input/InputCommands.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -75,8 +75,8 @@
class _CoreExport SimpleCommand : public BaseCommand
{
public:
- bool execute(float abs = 1.0f, float rel = 1.0f) override;
- CommandEvaluation* getEvaluation() override;
+ virtual bool execute(float abs = 1.0f, float rel = 1.0f) override;
+ virtual CommandEvaluation* getEvaluation() override;
virtual SimpleCommand* clone() override { return new SimpleCommand(*this); }
CommandEvaluation evaluation_;
@@ -103,8 +103,8 @@
{
public:
ParamCommand() : scale_(1.0f), paramCommand_(nullptr) { }
- bool execute(float abs = 1.0f, float rel = 1.0f) override;
- CommandEvaluation* getEvaluation() override;
+ virtual bool execute(float abs = 1.0f, float rel = 1.0f) override;
+ virtual CommandEvaluation* getEvaluation() override;
virtual ParamCommand* clone() override { return new ParamCommand(*this); }
float scale_;
Modified: code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -152,7 +152,7 @@
}
//! Captures OIS events (which then get distributed to the derived class) and creates the button held events
- void update(const Clock& time) override
+ virtual void update(const Clock& time) override
{
oisDevice_->capture();
@@ -170,7 +170,7 @@
}
//! Clears the list of pressed buttons and calls the derived class's method
- void clearBuffers() override
+ virtual void clearBuffers() override
{
pressedButtons_.clear();
static_cast<DeviceClass*>(this)->clearBuffersImpl();
@@ -179,7 +179,7 @@
// Returns a pointer to the OIS device
OISDeviceClass* getOISDevice() { return this->oisDevice_; }
// Returns the name of the derived class as string
- std::string getClassName() const override { return DeviceClass::getClassNameImpl(); }
+ virtual std::string getClassName() const override { return DeviceClass::getClassNameImpl(); }
protected:
//! Common code for all button pressed events (updates pressed buttons list and calls the input states)
Modified: code/branches/cpp11_v2/src/libraries/core/input/InputManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/InputManager.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/input/InputManager.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -207,7 +207,7 @@
void updateActiveStates();
// From WindowEventListener
- void windowFocusChanged(bool bFocus) override;
+ virtual void windowFocusChanged(bool bFocus) override;
private: // variables
State internalState_; //!< Current internal state
Modified: code/branches/cpp11_v2/src/libraries/core/input/InputState.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/InputState.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/input/InputState.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -156,7 +156,7 @@
InputState(const std::string& name, bool bAlwaysGetsInput, bool bTransparent, InputStatePriority priority);
~InputState() { }
- void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;
+ virtual void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;
//! Sets the priority (only to be used by the InputManager!)
void setPriority(int priority) { priority_ = priority; }
Modified: code/branches/cpp11_v2/src/libraries/core/input/JoyStick.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/JoyStick.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/input/JoyStick.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -76,8 +76,8 @@
const std::string& getDeviceName() const { return this->deviceName_; }
private:
- void calibrationStarted() override;
- void calibrationStopped() override;
+ virtual void calibrationStarted() override;
+ virtual void calibrationStopped() override;
void evaluateCalibration();
void clearBuffersImpl();
@@ -85,24 +85,24 @@
void fireAxis(int axis, int value);
//! OIS event handler
- bool buttonPressed (const OIS::JoyStickEvent &arg, int button) override
+ virtual bool buttonPressed (const OIS::JoyStickEvent &arg, int button) override
{
super::buttonPressed(static_cast<JoyStickButtonCode::ByEnum>(button));
return true;
}
//! OIS event handler
- bool buttonReleased(const OIS::JoyStickEvent &arg, int button) override
+ virtual bool buttonReleased(const OIS::JoyStickEvent &arg, int button) override
{
super::buttonReleased(static_cast<JoyStickButtonCode::ByEnum>(button));
return true;
}
- bool axisMoved (const OIS::JoyStickEvent &arg, int axis) override;
- bool sliderMoved (const OIS::JoyStickEvent &arg, int id) override;
- bool povMoved (const OIS::JoyStickEvent &arg, int id) override;
+ virtual bool axisMoved (const OIS::JoyStickEvent &arg, int axis) override;
+ virtual bool sliderMoved (const OIS::JoyStickEvent &arg, int id) override;
+ virtual bool povMoved (const OIS::JoyStickEvent &arg, int id) override;
//! OIS event handler (don't remove that because of OIS version issues!)
- bool vector3Moved (const OIS::JoyStickEvent &arg, int id) override { return true; }
+ virtual bool vector3Moved (const OIS::JoyStickEvent &arg, int id) override { return true; }
//! Returns the class name as string
static std::string getClassNameImpl() { return "JoyStick"; }
Modified: code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -85,26 +85,26 @@
// from JoyStickQuantityListener interface
virtual void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;
- void allDevicesUpdated(float dt) override;
- void mouseUpdated(float dt) override;
- void joyStickUpdated(unsigned int joyStick, float dt) override;
+ virtual void allDevicesUpdated(float dt) override;
+ virtual void mouseUpdated(float dt) override;
+ virtual void joyStickUpdated(unsigned int joyStick, float dt) override;
// internal
void tickHalfAxis(HalfAxis& halfAxis);
- void buttonPressed (const KeyEvent& evt) override;
- void buttonReleased(const KeyEvent& evt) override;
- void buttonHeld (const KeyEvent& evt) override;
+ virtual void buttonPressed (const KeyEvent& evt) override;
+ virtual void buttonReleased(const KeyEvent& evt) override;
+ virtual void buttonHeld (const KeyEvent& evt) override;
- void buttonPressed (MouseButtonCode::ByEnum button) override;
- void buttonReleased(MouseButtonCode::ByEnum button) override;
- void buttonHeld (MouseButtonCode::ByEnum button) override;
- void mouseMoved (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) override;
- void mouseScrolled (int abs, int rel) override;
+ virtual void buttonPressed (MouseButtonCode::ByEnum button) override;
+ virtual void buttonReleased(MouseButtonCode::ByEnum button) override;
+ virtual void buttonHeld (MouseButtonCode::ByEnum button) override;
+ virtual void mouseMoved (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) override;
+ virtual void mouseScrolled (int abs, int rel) override;
- void buttonPressed (unsigned int device, JoyStickButtonCode::ByEnum button) override;
- void buttonReleased(unsigned int device, JoyStickButtonCode::ByEnum button) override;
- void buttonHeld (unsigned int device, JoyStickButtonCode::ByEnum button) override;
- void axisMoved (unsigned int device, unsigned int axis, float value) override;
+ virtual void buttonPressed (unsigned int device, JoyStickButtonCode::ByEnum button) override;
+ virtual void buttonReleased(unsigned int device, JoyStickButtonCode::ByEnum button) override;
+ virtual void buttonHeld (unsigned int device, JoyStickButtonCode::ByEnum button) override;
+ virtual void axisMoved (unsigned int device, unsigned int axis, float value) override;
protected: // variables
//! Currently active joy sticks
Modified: code/branches/cpp11_v2/src/libraries/core/input/KeyDetector.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/KeyDetector.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/input/KeyDetector.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -50,7 +50,7 @@
KeyDetector(const KeyDetector&);
void callback(const std::string& name);
- void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;
+ virtual void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;
void assignCommands();
FunctorPtr callbackFunction_;
Modified: code/branches/cpp11_v2/src/libraries/core/input/Keyboard.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/Keyboard.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/input/Keyboard.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -74,8 +74,8 @@
return button;
}
- bool keyPressed(const OIS::KeyEvent& arg) override;
- bool keyReleased(const OIS::KeyEvent& arg) override;
+ virtual bool keyPressed(const OIS::KeyEvent& arg) override;
+ virtual bool keyReleased(const OIS::KeyEvent& arg) override;
//! Returns the class name as string
static std::string getClassNameImpl() { return "Keyboard"; }
Modified: code/branches/cpp11_v2/src/libraries/core/input/Mouse.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/Mouse.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/input/Mouse.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -73,22 +73,22 @@
private:
//! OIS event handler
- bool mousePressed(const OIS::MouseEvent &arg, OIS::MouseButtonID id) override
+ virtual bool mousePressed(const OIS::MouseEvent &arg, OIS::MouseButtonID id) override
{
super::buttonPressed(static_cast<MouseButtonCode::ByEnum>(id));
return true;
}
//! OIS event handler
- bool mouseReleased(const OIS::MouseEvent &arg, OIS::MouseButtonID id) override
+ virtual bool mouseReleased(const OIS::MouseEvent &arg, OIS::MouseButtonID id) override
{
super::buttonReleased(static_cast<MouseButtonCode::ByEnum>(id));
return true;
}
- bool mouseMoved(const OIS::MouseEvent &arg) override;
+ virtual bool mouseMoved(const OIS::MouseEvent &arg) override;
- void windowResized(unsigned int newWidth, unsigned int newHeight) override;
+ virtual void windowResized(unsigned int newWidth, unsigned int newHeight) override;
// Returns the class name as string
static std::string getClassNameImpl() { return "Mouse"; }
Modified: code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -123,7 +123,7 @@
}
/// Destructor
- inline virtual ~WeakPtr()
+ virtual inline ~WeakPtr()
{
this->unregisterAsDestructionListener(this->base_);
}
@@ -229,7 +229,7 @@
private:
/// Will be called by Destroyable::~Destroyable() if the stored object is deleted. Resets the wrapped pointer and executes the callback.
- inline void objectDeleted() override
+ virtual inline void objectDeleted() override
{
this->base_ = nullptr;
this->pointer_ = nullptr;
Modified: code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonWrapper.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonWrapper.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonWrapper.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -101,14 +101,14 @@
}
//! Called if the Scope of the Singleton gets active (creates the instance)
- void activated() override
+ virtual void activated() override
{
assert(singletonPtr_ == nullptr);
singletonPtr_ = new T();
}
//! Called if the Scope of this Singleton gets deactivated (destroys the instance)
- void deactivated() override
+ virtual void deactivated() override
{
assert(singletonPtr_ != nullptr);
this->destroy(singletonPtr_);
@@ -156,7 +156,7 @@
}
//! Called if the Scope of the Singleton gets active (creates the instance)
- void activated() override
+ virtual void activated() override
{
assert(singletonPtr_ == nullptr);
try
@@ -168,7 +168,7 @@
}
//! Called if the Scope of this Singleton gets deactivated (destroys the instance)
- void deactivated() override
+ virtual void deactivated() override
{
if (singletonPtr_ != nullptr)
{
Modified: code/branches/cpp11_v2/src/libraries/network/Client.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/Client.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/network/Client.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -75,10 +75,10 @@
static Client* getInstance(){ return singletonPtr_s; } // tolua_export
- bool establishConnection() override;
+ virtual bool establishConnection() override;
void setDestination( const std::string& serverAddress, unsigned int port ); // tolua_export
- bool closeConnection() override;
- void queuePacket(ENetPacket* packet, int clientID, uint8_t channelID) override;
+ virtual bool closeConnection() override;
+ virtual void queuePacket(ENetPacket* packet, int clientID, uint8_t channelID) override;
virtual bool sendPacket( packet::Packet* packet ) override{ return packet->send( static_cast<Host*>(this) ); }
virtual void doSendChat(const std::string& message, unsigned int sourceID, unsigned int targetID) override;
virtual void doReceiveChat(const std::string& message, unsigned int sourceID, unsigned int targetID) override;
@@ -90,7 +90,7 @@
private:
Client(const Client& copy); // not used
virtual bool isServer_() override{return false;}
- void processPacket(packet::Packet* packet) override;
+ virtual void processPacket(packet::Packet* packet) override;
static Client* singletonPtr_s;
bool isSynched_;
Modified: code/branches/cpp11_v2/src/libraries/network/NetworkFunction.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/NetworkFunction.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/network/NetworkFunction.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -141,7 +141,7 @@
, functor_(functor)
{ }
- inline bool call(uint32_t objectID) override
+ virtual inline bool call(uint32_t objectID) override
{
if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
{
@@ -151,7 +151,7 @@
else
return false;
}
- inline bool call(uint32_t objectID, const MultiType& mt1) override
+ virtual inline bool call(uint32_t objectID, const MultiType& mt1) override
{
if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
{
@@ -161,7 +161,7 @@
else
return false;
}
- inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2) override
+ virtual inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2) override
{
if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
{
@@ -171,7 +171,7 @@
else
return false;
}
- inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3) override
+ virtual inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3) override
{
if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
{
@@ -181,7 +181,7 @@
else
return false;
}
- inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4) override
+ virtual inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4) override
{
if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
{
@@ -191,7 +191,7 @@
else
return false;
}
- inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5) override
+ virtual inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5) override
{
if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
{
Modified: code/branches/cpp11_v2/src/libraries/network/Server.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/Server.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/network/Server.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -60,7 +60,7 @@
void open();
void close();
- void queuePacket(ENetPacket *packet, int clientID, uint8_t channelID) override;
+ virtual void queuePacket(ENetPacket *packet, int clientID, uint8_t channelID) override;
virtual bool sendPacket( packet::Packet* packet ) override{ return packet->send( static_cast<Host*>(this) ); }
void update(const Clock& time);
unsigned int getRTT(unsigned int clientID);
@@ -75,9 +75,9 @@
virtual bool isServer_() override{return true;}
unsigned int playerID(){return 0;}
- void addPeer(uint32_t peerID) override;
- void removePeer(uint32_t peerID) override;
- void processPacket(packet::Packet* packet) override;
+ virtual void addPeer(uint32_t peerID) override;
+ virtual void removePeer(uint32_t peerID) override;
+ virtual void processPacket(packet::Packet* packet) override;
bool createClient(int clientID);
void disconnectClient( uint32_t clientID );
Modified: code/branches/cpp11_v2/src/libraries/network/packet/Acknowledgement.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/packet/Acknowledgement.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/network/packet/Acknowledgement.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -45,7 +45,7 @@
Acknowledgement( uint8_t* data, unsigned int peerID );
~Acknowledgement();
- inline unsigned int getSize() const override;
+ virtual inline unsigned int getSize() const override;
virtual bool process(orxonox::Host* host) override;
unsigned int getAckID();
Modified: code/branches/cpp11_v2/src/libraries/network/packet/Chat.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/packet/Chat.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/network/packet/Chat.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -48,7 +48,7 @@
~Chat();
/* get size of packet */
- inline unsigned int getSize() const override;
+ virtual inline unsigned int getSize() const override;
/* process chat message packet and remove it afterwards */
virtual bool process(orxonox::Host* host) override;
Modified: code/branches/cpp11_v2/src/libraries/network/packet/ClassID.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/packet/ClassID.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/network/packet/ClassID.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -46,7 +46,7 @@
ClassID( uint8_t* data, unsigned int clientID );
~ClassID();
- uint32_t getSize() const override;
+ virtual uint32_t getSize() const override;
virtual bool process(orxonox::Host* host) override;
private:
Modified: code/branches/cpp11_v2/src/libraries/network/packet/DeleteObjects.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/packet/DeleteObjects.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/network/packet/DeleteObjects.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -47,7 +47,7 @@
bool fetchIDs();
- inline unsigned int getSize() const override;
+ virtual inline unsigned int getSize() const override;
virtual bool process(orxonox::Host* host) override;
private:
Modified: code/branches/cpp11_v2/src/libraries/network/packet/FunctionCalls.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/packet/FunctionCalls.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/network/packet/FunctionCalls.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -51,7 +51,7 @@
FunctionCalls( uint8_t* data, unsigned int clientID );
~FunctionCalls();
- inline unsigned int getSize() const override
+ virtual inline unsigned int getSize() const override
{ assert(!this->isDataENetAllocated()); return currentSize_; }
virtual bool process(orxonox::Host* host) override;
Modified: code/branches/cpp11_v2/src/libraries/network/packet/Welcome.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/packet/Welcome.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/network/packet/Welcome.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -44,8 +44,8 @@
Welcome( uint8_t* data, uint32_t clientID );
virtual ~Welcome();
- uint8_t *getData() override;
- inline unsigned int getSize() const override;
+ virtual uint8_t *getData() override;
+ virtual inline unsigned int getSize() const override;
virtual bool process(orxonox::Host* host) override;
private:
Modified: code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -43,8 +43,8 @@
void configure(bool bFill, float fillAlpha);
protected:
- bool frameStarted(const Ogre::FrameEvent& evt) override;
- bool frameEnded(const Ogre::FrameEvent& evt) override;
+ virtual bool frameStarted(const Ogre::FrameEvent& evt) override;
+ virtual bool frameEnded(const Ogre::FrameEvent& evt) override;
private:
struct ContactPoint
Modified: code/branches/cpp11_v2/src/libraries/util/MultiType.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/MultiType.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/util/MultiType.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -174,7 +174,7 @@
{
public:
inline MT_ValueBase(void* data, Type::Enum type) : type_(type), bLastConversionSuccessful(true), data_(data) {}
- inline virtual ~MT_ValueBase() {}
+ virtual inline ~MT_ValueBase() {}
virtual MT_ValueBase* clone() const = 0;
Modified: code/branches/cpp11_v2/src/libraries/util/MultiTypeValue.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/MultiTypeValue.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/libraries/util/MultiTypeValue.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -57,40 +57,40 @@
MT_Value(const T& value, MultiType::Type::Enum type) : MT_ValueBase(&this->value_, type), value_(value) {}
/// Creates a copy of itself.
- inline MT_ValueBase* clone() const override { return new MT_Value<T>(this->value_, this->type_); }
+ virtual inline MT_ValueBase* clone() const override { return new MT_Value<T>(this->value_, this->type_); }
/// Resets the current value to the default.
- inline void reset() override { this->value_ = zeroise<T>(); bLastConversionSuccessful = true; }
+ virtual inline void reset() override { this->value_ = zeroise<T>(); bLastConversionSuccessful = true; }
- inline bool getValue(char* value) const override { return convertValue<T, char >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
- inline bool getValue(unsigned char* value) const override { return convertValue<T, unsigned char >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
- inline bool getValue(short* value) const override { return convertValue<T, short >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
- inline bool getValue(unsigned short* value) const override { return convertValue<T, unsigned short >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
- inline bool getValue(int* value) const override { return convertValue<T, int >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
- inline bool getValue(unsigned int* value) const override { return convertValue<T, unsigned int >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
- inline bool getValue(long* value) const override { return convertValue<T, long >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
- inline bool getValue(unsigned long* value) const override { return convertValue<T, unsigned long >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
- inline bool getValue(long long* value) const override { return convertValue<T, long long >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
- inline bool getValue(unsigned long long* value) const override { return convertValue<T, unsigned long long >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
- inline bool getValue(float* value) const override { return convertValue<T, float >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
- inline bool getValue(double* value) const override { return convertValue<T, double >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
- inline bool getValue(long double* value) const override { return convertValue<T, long double >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
- inline bool getValue(bool* value) const override { return convertValue<T, bool >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
- inline bool getValue(void** value) const override { return convertValue<T, void* >(value, value_, nullptr); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
- inline bool getValue(std::string* value) const override { return convertValue<T, std::string >(value, value_, NilValue<std::string> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
- inline bool getValue(orxonox::Vector2* value) const override { return convertValue<T, orxonox::Vector2 >(value, value_, NilValue<orxonox::Vector2> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
- inline bool getValue(orxonox::Vector3* value) const override { return convertValue<T, orxonox::Vector3 >(value, value_, NilValue<orxonox::Vector3> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
- inline bool getValue(orxonox::Vector4* value) const override { return convertValue<T, orxonox::Vector4 >(value, value_, NilValue<orxonox::Vector4> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
- inline bool getValue(orxonox::ColourValue* value) const override { return convertValue<T, orxonox::ColourValue>(value, value_, NilValue<orxonox::ColourValue>()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
- inline bool getValue(orxonox::Quaternion* value) const override { return convertValue<T, orxonox::Quaternion >(value, value_, NilValue<orxonox::Quaternion> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
- inline bool getValue(orxonox::Radian* value) const override { return convertValue<T, orxonox::Radian >(value, value_, NilValue<orxonox::Radian> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
- inline bool getValue(orxonox::Degree* value) const override { return convertValue<T, orxonox::Degree >(value, value_, NilValue<orxonox::Degree> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+ virtual inline bool getValue(char* value) const override { return convertValue<T, char >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+ virtual inline bool getValue(unsigned char* value) const override { return convertValue<T, unsigned char >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+ virtual inline bool getValue(short* value) const override { return convertValue<T, short >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+ virtual inline bool getValue(unsigned short* value) const override { return convertValue<T, unsigned short >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+ virtual inline bool getValue(int* value) const override { return convertValue<T, int >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+ virtual inline bool getValue(unsigned int* value) const override { return convertValue<T, unsigned int >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+ virtual inline bool getValue(long* value) const override { return convertValue<T, long >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+ virtual inline bool getValue(unsigned long* value) const override { return convertValue<T, unsigned long >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+ virtual inline bool getValue(long long* value) const override { return convertValue<T, long long >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+ virtual inline bool getValue(unsigned long long* value) const override { return convertValue<T, unsigned long long >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+ virtual inline bool getValue(float* value) const override { return convertValue<T, float >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+ virtual inline bool getValue(double* value) const override { return convertValue<T, double >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+ virtual inline bool getValue(long double* value) const override { return convertValue<T, long double >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+ virtual inline bool getValue(bool* value) const override { return convertValue<T, bool >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+ virtual inline bool getValue(void** value) const override { return convertValue<T, void* >(value, value_, nullptr); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+ virtual inline bool getValue(std::string* value) const override { return convertValue<T, std::string >(value, value_, NilValue<std::string> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+ virtual inline bool getValue(orxonox::Vector2* value) const override { return convertValue<T, orxonox::Vector2 >(value, value_, NilValue<orxonox::Vector2> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+ virtual inline bool getValue(orxonox::Vector3* value) const override { return convertValue<T, orxonox::Vector3 >(value, value_, NilValue<orxonox::Vector3> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+ virtual inline bool getValue(orxonox::Vector4* value) const override { return convertValue<T, orxonox::Vector4 >(value, value_, NilValue<orxonox::Vector4> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+ virtual inline bool getValue(orxonox::ColourValue* value) const override { return convertValue<T, orxonox::ColourValue>(value, value_, NilValue<orxonox::ColourValue>()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+ virtual inline bool getValue(orxonox::Quaternion* value) const override { return convertValue<T, orxonox::Quaternion >(value, value_, NilValue<orxonox::Quaternion> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+ virtual inline bool getValue(orxonox::Radian* value) const override { return convertValue<T, orxonox::Radian >(value, value_, NilValue<orxonox::Radian> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+ virtual inline bool getValue(orxonox::Degree* value) const override { return convertValue<T, orxonox::Degree >(value, value_, NilValue<orxonox::Degree> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
/**
@brief Assigns the value of the other MultiType, converted to T.
@param other The other MultiType
*/
- inline bool setValue(const MultiType& other) override
+ virtual inline bool setValue(const MultiType& other) override
{
if (other.value_)
{
@@ -103,39 +103,39 @@
}
}
- inline bool setValue(const char& value) override { return (bLastConversionSuccessful = convertValue<char , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const unsigned char& value) override { return (bLastConversionSuccessful = convertValue<unsigned char , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const short& value) override { return (bLastConversionSuccessful = convertValue<short , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const unsigned short& value) override { return (bLastConversionSuccessful = convertValue<unsigned short , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const int& value) override { return (bLastConversionSuccessful = convertValue<int , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const unsigned int& value) override { return (bLastConversionSuccessful = convertValue<unsigned int , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const long& value) override { return (bLastConversionSuccessful = convertValue<long , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const unsigned long& value) override { return (bLastConversionSuccessful = convertValue<unsigned long , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const long long& value) override { return (bLastConversionSuccessful = convertValue<long long , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const unsigned long long& value) override { return (bLastConversionSuccessful = convertValue<unsigned long long , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const float& value) override { return (bLastConversionSuccessful = convertValue<float , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const double& value) override { return (bLastConversionSuccessful = convertValue<double , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const long double& value) override { return (bLastConversionSuccessful = convertValue<long double , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const bool& value) override { return (bLastConversionSuccessful = convertValue<bool , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue( void* const& value) override { return (bLastConversionSuccessful = convertValue<void* , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const std::string& value) override { return (bLastConversionSuccessful = convertValue<std::string , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const orxonox::Vector2& value) override { return (bLastConversionSuccessful = convertValue<orxonox::Vector2 , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const orxonox::Vector3& value) override { return (bLastConversionSuccessful = convertValue<orxonox::Vector3 , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const orxonox::Vector4& value) override { return (bLastConversionSuccessful = convertValue<orxonox::Vector4 , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const orxonox::ColourValue& value) override { return (bLastConversionSuccessful = convertValue<orxonox::ColourValue, T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const orxonox::Quaternion& value) override { return (bLastConversionSuccessful = convertValue<orxonox::Quaternion , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const orxonox::Radian& value) override { return (bLastConversionSuccessful = convertValue<orxonox::Radian , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const orxonox::Degree& value) override { return (bLastConversionSuccessful = convertValue<orxonox::Degree , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+ virtual inline bool setValue(const char& value) override { return (bLastConversionSuccessful = convertValue<char , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+ virtual inline bool setValue(const unsigned char& value) override { return (bLastConversionSuccessful = convertValue<unsigned char , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+ virtual inline bool setValue(const short& value) override { return (bLastConversionSuccessful = convertValue<short , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+ virtual inline bool setValue(const unsigned short& value) override { return (bLastConversionSuccessful = convertValue<unsigned short , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+ virtual inline bool setValue(const int& value) override { return (bLastConversionSuccessful = convertValue<int , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+ virtual inline bool setValue(const unsigned int& value) override { return (bLastConversionSuccessful = convertValue<unsigned int , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+ virtual inline bool setValue(const long& value) override { return (bLastConversionSuccessful = convertValue<long , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+ virtual inline bool setValue(const unsigned long& value) override { return (bLastConversionSuccessful = convertValue<unsigned long , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+ virtual inline bool setValue(const long long& value) override { return (bLastConversionSuccessful = convertValue<long long , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+ virtual inline bool setValue(const unsigned long long& value) override { return (bLastConversionSuccessful = convertValue<unsigned long long , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+ virtual inline bool setValue(const float& value) override { return (bLastConversionSuccessful = convertValue<float , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+ virtual inline bool setValue(const double& value) override { return (bLastConversionSuccessful = convertValue<double , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+ virtual inline bool setValue(const long double& value) override { return (bLastConversionSuccessful = convertValue<long double , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+ virtual inline bool setValue(const bool& value) override { return (bLastConversionSuccessful = convertValue<bool , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+ virtual inline bool setValue( void* const& value) override { return (bLastConversionSuccessful = convertValue<void* , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+ virtual inline bool setValue(const std::string& value) override { return (bLastConversionSuccessful = convertValue<std::string , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+ virtual inline bool setValue(const orxonox::Vector2& value) override { return (bLastConversionSuccessful = convertValue<orxonox::Vector2 , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+ virtual inline bool setValue(const orxonox::Vector3& value) override { return (bLastConversionSuccessful = convertValue<orxonox::Vector3 , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+ virtual inline bool setValue(const orxonox::Vector4& value) override { return (bLastConversionSuccessful = convertValue<orxonox::Vector4 , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+ virtual inline bool setValue(const orxonox::ColourValue& value) override { return (bLastConversionSuccessful = convertValue<orxonox::ColourValue, T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+ virtual inline bool setValue(const orxonox::Quaternion& value) override { return (bLastConversionSuccessful = convertValue<orxonox::Quaternion , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+ virtual inline bool setValue(const orxonox::Radian& value) override { return (bLastConversionSuccessful = convertValue<orxonox::Radian , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+ virtual inline bool setValue(const orxonox::Degree& value) override { return (bLastConversionSuccessful = convertValue<orxonox::Degree , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
/// Puts the current value on the stream
- inline void toString(std::ostream& outstream) const override { outstream << this->value_; }
+ virtual inline void toString(std::ostream& outstream) const override { outstream << this->value_; }
/// loads data from the bytestream (mem) into the MT and increases the bytestream pointer by the size of the data
- inline void importData( uint8_t*& mem ) override { loadAndIncrease( /*(const T&)*/this->value_, mem ); }
+ virtual inline void importData( uint8_t*& mem ) override { loadAndIncrease( /*(const T&)*/this->value_, mem ); }
/// saves data from the MT into the bytestream (mem) and increases the bytestream pointer by the size of the data
- inline void exportData( uint8_t*& mem ) const override { saveAndIncrease( /*(const T&)*/this->value_, mem ); }
+ virtual inline void exportData( uint8_t*& mem ) const override { saveAndIncrease( /*(const T&)*/this->value_, mem ); }
/// returns the size of the data that would be saved by exportData
- inline uint8_t getSize() const override { return returnSize( this->value_ ); }
+ virtual inline uint8_t getSize() const override { return returnSize( this->value_ ); }
T value_; ///< The stored value
};
Modified: code/branches/cpp11_v2/src/modules/designtools/CreateStars.h
===================================================================
--- code/branches/cpp11_v2/src/modules/designtools/CreateStars.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/modules/designtools/CreateStars.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -42,7 +42,7 @@
void createBillboards();
- void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void setNumStars(int num) {
this->numStars_ = num;
Modified: code/branches/cpp11_v2/src/modules/designtools/SkyboxGenerator.h
===================================================================
--- code/branches/cpp11_v2/src/modules/designtools/SkyboxGenerator.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/modules/designtools/SkyboxGenerator.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -64,7 +64,7 @@
public:
SkyboxGenerator();
virtual ~SkyboxGenerator();
- void tick(float dt) override; // This is where the skybox generation happens.
+ virtual void tick(float dt) override; // This is where the skybox generation happens.
static void createSkybox(void); // Generate the 6 faces of a skybox.
void setConfigValues(void); // Sets some config values.
Modified: code/branches/cpp11_v2/src/modules/gametypes/OldRaceCheckPoint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/gametypes/OldRaceCheckPoint.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/modules/gametypes/OldRaceCheckPoint.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -63,7 +63,7 @@
virtual void setTimelimit(float timeLimit);
inline float getTimeLimit()
{ return this->bTimeLimit_;}
- inline const WorldEntity* getWorldEntity() const override
+ virtual inline const WorldEntity* getWorldEntity() const override
{ return this; }
private:
Modified: code/branches/cpp11_v2/src/modules/gametypes/RaceCheckPoint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/gametypes/RaceCheckPoint.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/modules/gametypes/RaceCheckPoint.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -93,7 +93,7 @@
virtual void fire(bool bIsTriggered, BaseObject* originator) override;
- inline const WorldEntity* getWorldEntity() const override
+ virtual inline const WorldEntity* getWorldEntity() const override
{
return this;
}
Modified: code/branches/cpp11_v2/src/modules/gametypes/SpaceRace.h
===================================================================
--- code/branches/cpp11_v2/src/modules/gametypes/SpaceRace.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/modules/gametypes/SpaceRace.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -56,7 +56,7 @@
SpaceRace(Context* context);
virtual ~SpaceRace() {}
- void tick(float dt) override;
+ virtual void tick(float dt) override;
virtual void end() override;
@@ -69,9 +69,9 @@
inline Clock& getClock()
{ return this->clock_; }
- bool allowPawnHit(Pawn* victim, Pawn* originator) override;
- bool allowPawnDamage(Pawn* victim, Pawn* originator) override;
- bool allowPawnDeath(Pawn* victim, Pawn* originator) override;
+ virtual bool allowPawnHit(Pawn* victim, Pawn* originator) override;
+ virtual bool allowPawnDamage(Pawn* victim, Pawn* originator) override;
+ virtual bool allowPawnDeath(Pawn* victim, Pawn* originator) override;
private:
bool cantMove_; ///< Helper variable, used to stall the engines before the race starts.
Modified: code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.h
===================================================================
--- code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -57,7 +57,7 @@
SpaceRaceManager(Context* context);
virtual ~SpaceRaceManager() ;
- void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void addCheckpoint(RaceCheckPoint* checkpoint);
RaceCheckPoint* getCheckpoint(unsigned int index) const;
@@ -68,7 +68,7 @@
std::vector<RaceCheckPoint*> getAllCheckpoints();
- void tick(float dt) override;
+ virtual void tick(float dt) override;
protected:
bool reachedValidCheckpoint(RaceCheckPoint* oldCheckpoint, RaceCheckPoint* newCheckpoint, PlayerInfo* player) const;
Modified: code/branches/cpp11_v2/src/modules/objects/Attacher.h
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/Attacher.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/modules/objects/Attacher.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -63,7 +63,7 @@
inline const std::string& getTarget() const
{ return this->targetname_; }
- void loadedNewXMLName(BaseObject* object) override;
+ virtual void loadedNewXMLName(BaseObject* object) override;
private:
WorldEntity* target_;
Modified: code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.h
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -92,9 +92,9 @@
void setReaction(int mode);
int getReaction();
- void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
- void tick(float dt) override;
+ virtual void tick(float dt) override;
private:
struct BillboardAdministration{ bool usedYet; Billboard* billy; };
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -44,7 +44,7 @@
virtual void changedOwner() override;
- void announcemessage(const GametypeInfo* gtinfo, const std::string& message) override;
+ virtual void announcemessage(const GametypeInfo* gtinfo, const std::string& message) override;
private:
PlayerInfo* owner_;
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -44,7 +44,7 @@
virtual void changedOwner() override;
- void deathmessage(const GametypeInfo* gtinfo, const std::string& message) override;
+ virtual void deathmessage(const GametypeInfo* gtinfo, const std::string& message) override;
private:
PlayerInfo* owner_;
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -44,7 +44,7 @@
virtual void changedOwner() override;
- void fadingmessage(const GametypeInfo* gtinfo, const std::string& message) override;
+ virtual void fadingmessage(const GametypeInfo* gtinfo, const std::string& message) override;
private:
PlayerInfo* owner_;
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -47,7 +47,7 @@
virtual void changedOwner() override;
- void staticmessage(const GametypeInfo* gtinfo, const std::string& message, const ColourValue& colour) override;
+ virtual void staticmessage(const GametypeInfo* gtinfo, const std::string& message, const ColourValue& colour) override;
private:
PlayerInfo* owner_;
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -42,7 +42,7 @@
void setConfigValues();
virtual void tick(float dt) override;
- void changedOwner() override;
+ virtual void changedOwner() override;
private:
void updateTarget();
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -64,7 +64,7 @@
virtual void positionChanged() override { }
virtual void radarTick(float dt) override {}
- inline float getRadarSensitivity() const override
+ virtual inline float getRadarSensitivity() const override
{ return 1.0f; }
inline unsigned int getMarkerLimit() const
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -79,7 +79,7 @@
std::string get3DMaterialBack() const {return this->material3DBack_; }
void set3DMaterialBack(std::string material3DBack) { this->material3DBack_ = material3DBack; }
- float getRadarSensitivity() const override { return this->sensitivity_; }
+ virtual float getRadarSensitivity() const override { return this->sensitivity_; }
// used also by RadarListener interface!
void setRadarSensitivity(float sensitivity) { this->sensitivity_ = sensitivity; }
@@ -91,7 +91,7 @@
virtual void addObject(RadarViewable* viewable) override;
virtual void removeObject(RadarViewable* viewable) override;
virtual void objectChanged( RadarViewable* rv ) override;
- void radarTick(float dt) override;
+ virtual void radarTick(float dt) override;
bool showObject( RadarViewable* rv ); //!< Do not display an object on radar, if showObject(.) is false.
void gatherObjects();
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -44,7 +44,7 @@
virtual void changedOwner() override;
- void killmessage(const GametypeInfo* gtinfo, const std::string& message) override;
+ virtual void killmessage(const GametypeInfo* gtinfo, const std::string& message) override;
private:
PlayerInfo* owner_;
Modified: code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -68,7 +68,7 @@
inline void setTarget(const std::string & target) //!< add types which are allowed to activate the PortalEndPoint
{ this->trigger_->addTarget(target); }
- void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
static std::map<unsigned int, PortalEndPoint *> idMap_s; //!< Maps the id of each PortalEndPoint to a pointer to that PortalEndPoint
inline void setReenterDelay(unsigned int seconds)
{ this->reenterDelay_ = seconds; }
Modified: code/branches/cpp11_v2/src/orxonox/PlayerManager.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/PlayerManager.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/PlayerManager.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -49,8 +49,8 @@
inline const std::map<unsigned int, PlayerInfo*>& getClients() const
{ return this->clients_; }
- void clientConnected(unsigned int clientID) override;
- void clientDisconnected(unsigned int clientID) override;
+ virtual void clientConnected(unsigned int clientID) override;
+ virtual void clientDisconnected(unsigned int clientID) override;
void disconnectAllClients();
private:
Modified: code/branches/cpp11_v2/src/orxonox/Scene.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/Scene.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/Scene.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -79,7 +79,7 @@
inline Radar* getRadar()
{ return this->radar_; }
- inline virtual uint32_t getSceneID() const override { return this->getObjectID(); }
+ virtual inline uint32_t getSceneID() const override { return this->getObjectID(); }
virtual void tick(float dt) override;
Modified: code/branches/cpp11_v2/src/orxonox/chat/ChatInputHandler.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/chat/ChatInputHandler.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/chat/ChatInputHandler.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -124,7 +124,7 @@
* Deal with incoming chat (which means in our case: Add it to the
* history window of the full chat window)
*/
- void incomingChat(const std::string& message, const std::string& name) override;
+ virtual void incomingChat(const std::string& message, const std::string& name) override;
/** \param full true means show full chat window with history,
false means show only an input line
Modified: code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -73,7 +73,7 @@
private:
void updatePublicShape();
- inline virtual btCollisionShape* createNewShape() const override
+ virtual inline btCollisionShape* createNewShape() const override
{ assert(false); return nullptr; }
btCompoundShape* compoundShape_;
Modified: code/branches/cpp11_v2/src/orxonox/collisionshapes/WorldEntityCollisionShape.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/collisionshapes/WorldEntityCollisionShape.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/collisionshapes/WorldEntityCollisionShape.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -48,7 +48,7 @@
virtual void updateParent() override;
private:
- void parentChanged() override;
+ virtual void parentChanged() override;
WorldEntity* worldEntityOwner_;
};
Modified: code/branches/cpp11_v2/src/orxonox/gamestates/GSClient.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gamestates/GSClient.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/gamestates/GSClient.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -42,9 +42,9 @@
GSClient(const GameStateInfo& info);
~GSClient();
- void activate() override;
- void deactivate() override;
- void update(const Clock& time) override;
+ virtual void activate() override;
+ virtual void deactivate() override;
+ virtual void update(const Clock& time) override;
};
}
Modified: code/branches/cpp11_v2/src/orxonox/gamestates/GSGraphics.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gamestates/GSGraphics.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/gamestates/GSGraphics.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -52,9 +52,9 @@
GSGraphics(const GameStateInfo& info);
~GSGraphics();
- void activate() override;
- void deactivate() override;
- void update(const Clock& time) override;
+ virtual void activate() override;
+ virtual void deactivate() override;
+ virtual void update(const Clock& time) override;
private:
};
Modified: code/branches/cpp11_v2/src/orxonox/gamestates/GSLevel.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gamestates/GSLevel.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/gamestates/GSLevel.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -43,9 +43,9 @@
GSLevel(const GameStateInfo& info);
~GSLevel();
- void activate() override;
- void deactivate() override;
- void update(const Clock& time) override;
+ virtual void activate() override;
+ virtual void deactivate() override;
+ virtual void update(const Clock& time) override;
static void startMainMenu(void); //!< Starts the MainMenu
static void changeGame(const std::string& level); //!< Terminates the current game and starts a new game.
Modified: code/branches/cpp11_v2/src/orxonox/gamestates/GSMainMenu.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gamestates/GSMainMenu.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/gamestates/GSMainMenu.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -43,9 +43,9 @@
GSMainMenu(const GameStateInfo& info);
~GSMainMenu();
- void activate() override;
- void deactivate() override;
- void update(const Clock& time) override;
+ virtual void activate() override;
+ virtual void deactivate() override;
+ virtual void update(const Clock& time) override;
void setConfigValues();
void reloadSound();
Modified: code/branches/cpp11_v2/src/orxonox/gamestates/GSMasterServer.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gamestates/GSMasterServer.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/gamestates/GSMasterServer.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -44,9 +44,9 @@
GSMasterServer(const GameStateInfo& info);
~GSMasterServer();
- void activate() override;
- void deactivate() override;
- void update(const Clock& time) override;
+ virtual void activate() override;
+ virtual void deactivate() override;
+ virtual void update(const Clock& time) override;
private:
MasterServer *mserver;
Modified: code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -43,9 +43,9 @@
static void printObjects();
- void activate() override;
- void deactivate() override;
- void update(const Clock& time) override;
+ virtual void activate() override;
+ virtual void deactivate() override;
+ virtual void update(const Clock& time) override;
// this has to be public because proteced triggers a bug in msvc
// when taking the function address.
Modified: code/branches/cpp11_v2/src/orxonox/gamestates/GSServer.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gamestates/GSServer.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/gamestates/GSServer.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -42,9 +42,9 @@
GSServer(const GameStateInfo& info);
~GSServer();
- void activate() override;
- void deactivate() override;
- void update(const Clock& time) override;
+ virtual void activate() override;
+ virtual void deactivate() override;
+ virtual void update(const Clock& time) override;
private:
Server* server_;
Modified: code/branches/cpp11_v2/src/orxonox/gamestates/GSStandalone.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gamestates/GSStandalone.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/gamestates/GSStandalone.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -40,9 +40,9 @@
GSStandalone(const GameStateInfo& info);
~GSStandalone();
- void activate() override;
- void deactivate() override;
- void update(const Clock& time) override;
+ virtual void activate() override;
+ virtual void deactivate() override;
+ virtual void update(const Clock& time) override;
private:
};
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -77,8 +77,8 @@
virtual void rewardPig();
void grantPigBoost(SpaceShip* spaceship); // Grant the piggy a boost.
void resetSpeedFactor(SpaceShip* spaceship);
- void tick (float dt) override;// used to end the game
- SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const override;
+ virtual void tick (float dt) override;// used to end the game
+ virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const override;
protected:
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/LastManStanding.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/LastManStanding.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/LastManStanding.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -79,7 +79,7 @@
virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn) override; //!< Resets punishment time and respawn delay.
void punishPlayer(PlayerInfo* player); //!< Function in order to kill a player. Punishment for hiding longer than "timeRemaining".
- void tick (float dt) override; //!< used to end the game
+ virtual void tick (float dt) override; //!< used to end the game
};
}
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/LastTeamStanding.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/LastTeamStanding.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/LastTeamStanding.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -79,7 +79,7 @@
virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr) override; //!< Manages each player's lost lives.
virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr) override; //!< If a player shoot's an opponent, his punishment countdown will be resetted.
virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn) override; //!< Resets punishment time and respawn delay.
- void tick (float dt) override; //!< used to end the game
+ virtual void tick (float dt) override; //!< used to end the game
virtual void end() override; //!< Sends an end message.
void punishPlayer(PlayerInfo* player); //!< Function in order to kill a player. Punishment for hiding longer than "timeRemaining".
int playerGetLives(PlayerInfo* player); //!< getFunction for the map "playerLives_".
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -42,7 +42,7 @@
virtual ~UnderAttack() {}
void setConfigValues();
- void tick (float dt) override;
+ virtual void tick (float dt) override;
void addDestroyer(Destroyer* destroyer);
inline Destroyer* getDestroyer() const
{ return this->destroyer_; }
Modified: code/branches/cpp11_v2/src/orxonox/graphics/Camera.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/graphics/Camera.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/graphics/Camera.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -71,7 +71,7 @@
void configvaluecallback_changedFovAndAspectRatio();
void configvaluecallback_changedNearClipDistance();
- void windowResized(unsigned int newWidth, unsigned int newHeight) override;
+ virtual void windowResized(unsigned int newWidth, unsigned int newHeight) override;
Ogre::Camera* camera_;
Ogre::SceneNode* cameraNode_;
Modified: code/branches/cpp11_v2/src/orxonox/infos/Bot.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/infos/Bot.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/infos/Bot.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -44,11 +44,11 @@
void setConfigValues();
- inline bool isInitialized() const override
+ virtual inline bool isInitialized() const override
{ return true; }
- inline float getPing() const override
+ virtual inline float getPing() const override
{ return 0; }
- inline float getPacketLossRatio() const override
+ virtual inline float getPacketLossRatio() const override
{ return 0; }
private:
Modified: code/branches/cpp11_v2/src/orxonox/infos/HumanPlayer.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/infos/HumanPlayer.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/infos/HumanPlayer.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -44,9 +44,9 @@
void setConfigValues();
- bool isInitialized() const override;
- float getPing() const override;
- float getPacketLossRatio() const override;
+ virtual bool isInitialized() const override;
+ virtual float getPing() const override;
+ virtual float getPacketLossRatio() const override;
void setClientID(unsigned int clientID);
Modified: code/branches/cpp11_v2/src/orxonox/interfaces/PickupCarrier.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/interfaces/PickupCarrier.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/interfaces/PickupCarrier.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -76,7 +76,7 @@
public:
PickupCarrier(); //!< Constructor.
virtual ~PickupCarrier(); //!< Destructor.
- void preDestroy(void) override; //!< Is called before the PickupCarrier is effectively destroyed.
+ virtual void preDestroy(void) override; //!< Is called before the PickupCarrier is effectively destroyed.
bool isTarget(const Pickupable* pickup) const; //!< Can be used to check whether the PickupCarrier or a child of his is a target ot the input Pickupable.
PickupCarrier* getTarget(const Pickupable* pickup); //!< Get the carrier that is both a child of the PickupCarrier (or the PickupCarrier itself) and a target of the input Pickupable.
Modified: code/branches/cpp11_v2/src/orxonox/overlays/GUISheet.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/overlays/GUISheet.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/overlays/GUISheet.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -43,7 +43,7 @@
GUISheet(Context* context);
~GUISheet();
- void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void show();
void hide();
Modified: code/branches/cpp11_v2/src/orxonox/overlays/InGameConsole.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/overlays/InGameConsole.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/overlays/InGameConsole.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -52,8 +52,8 @@
void initialise();
void setConfigValues();
- void preUpdate(const Clock& time) override;
- void postUpdate(const Clock& time) override { /*no action*/ }
+ virtual void preUpdate(const Clock& time) override;
+ virtual void postUpdate(const Clock& time) override { /*no action*/ }
static void openConsole();
static void closeConsole();
@@ -64,19 +64,19 @@
void activate();
void deactivate();
- void linesChanged() override;
- void lineAdded() override;
- void inputChanged() override;
- void cursorChanged() override;
- void executed() override;
- void exit() override;
+ virtual void linesChanged() override;
+ virtual void lineAdded() override;
+ virtual void inputChanged() override;
+ virtual void cursorChanged() override;
+ virtual void executed() override;
+ virtual void exit() override;
void shiftLines();
void colourLine(Shell::LineType type, int index);
void setCursorPosition(unsigned int pos);
void print(const std::string& text, Shell::LineType type, int index, bool alwaysShift = false);
- void windowResized(unsigned int newWidth, unsigned int newHeight) override;
+ virtual void windowResized(unsigned int newWidth, unsigned int newHeight) override;
// config value related
void bHidesAllInputChanged();
Modified: code/branches/cpp11_v2/src/orxonox/overlays/OrxonoxOverlay.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/overlays/OrxonoxOverlay.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/overlays/OrxonoxOverlay.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -205,7 +205,7 @@
RotationState rotState_; //!< horizontal, vertical or inbetween
private:
- void windowResized(unsigned int newWidth, unsigned int newHeight) override;
+ virtual void windowResized(unsigned int newWidth, unsigned int newHeight) override;
static unsigned int hudOverlayCounter_s; //!< Static counter for hud elements
/** Contains all the overlays in a map for quick access via console commands.
Modified: code/branches/cpp11_v2/src/orxonox/sound/AmbientSound.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/sound/AmbientSound.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/sound/AmbientSound.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -49,9 +49,9 @@
public:
AmbientSound();
- void play() override;
- bool stop() override;
- void pause() override;
+ virtual void play() override;
+ virtual bool stop() override;
+ virtual void pause() override;
bool setAmbientSource(const std::string& source);
inline const std::string& getAmbientSource() const
@@ -65,9 +65,9 @@
~AmbientSound() { }
private:
- void preDestroy() override;
- float getRealVolume() override;
- bool moodChanged(const std::string& mood) override;
+ virtual void preDestroy() override;
+ virtual float getRealVolume() override;
+ virtual bool moodChanged(const std::string& mood) override;
inline void ambientSourceChanged()
{ this->setAmbientSource(this->ambientSource_); }
inline void playOnLoadChanged()
Modified: code/branches/cpp11_v2/src/orxonox/sound/SoundManager.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/sound/SoundManager.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/sound/SoundManager.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -67,8 +67,8 @@
SoundManager();
~SoundManager();
- void preUpdate(const Clock& time) override;
- void postUpdate(const Clock& time) override { /*no action*/ }
+ virtual void preUpdate(const Clock& time) override;
+ virtual void postUpdate(const Clock& time) override { /*no action*/ }
void setConfigValues();
// tolua_begin
Modified: code/branches/cpp11_v2/src/orxonox/sound/WorldAmbientSound.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/sound/WorldAmbientSound.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/sound/WorldAmbientSound.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -49,8 +49,8 @@
WorldAmbientSound(Context* context);
virtual ~WorldAmbientSound();
- void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
- void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
virtual void changedActivity() override;
Modified: code/branches/cpp11_v2/src/orxonox/sound/WorldSound.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/sound/WorldSound.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/sound/WorldSound.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -46,19 +46,19 @@
public:
WorldSound(Context* context);
- void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
- void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
- void changedActivity() override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void changedActivity() override;
- void tick(float dt) override;
+ virtual void tick(float dt) override;
protected:
~WorldSound() {}
private:
void registerVariables();
- void initialiseSource() override;
- float getRealVolume() override;
+ virtual void initialiseSource() override;
+ virtual float getRealVolume() override;
};
}
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -140,10 +140,10 @@
using MobileEntity::setVelocity;
using MobileEntity::setAngularVelocity;
- void setPosition(const Vector3& position) override;
- void setOrientation(const Quaternion& orientation) override;
- void setVelocity(const Vector3& velocity) override;
- void setAngularVelocity(const Vector3& velocity) override;
+ virtual void setPosition(const Vector3& position) override;
+ virtual void setOrientation(const Quaternion& orientation) override;
+ virtual void setVelocity(const Vector3& velocity) override;
+ virtual void setAngularVelocity(const Vector3& velocity) override;
inline bool hasLocalController() const
{ return this->bHasLocalController_; }
@@ -213,7 +213,7 @@
void networkcallback_changedplayerID();
// Bullet btMotionState related
- void setWorldTransform(const btTransform& worldTrans) override;
+ virtual void setWorldTransform(const btTransform& worldTrans) override;
unsigned int server_overwrite_;
unsigned int client_overwrite_;
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/MobileEntity.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/MobileEntity.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/MobileEntity.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -63,7 +63,7 @@
virtual void setVelocity(const Vector3& velocity);
inline void setVelocity(float x, float y, float z)
{ this->setVelocity(Vector3(x, y, z)); }
- inline const Vector3& getVelocity() const override
+ virtual inline const Vector3& getVelocity() const override
{ return this->linearVelocity_; }
/**
@brief Get the velocity in the coordinate-system of the MoblieEntity.
@@ -108,7 +108,7 @@
protected:
// Bullet btMotionState related
virtual void setWorldTransform(const btTransform& worldTrans) override;
- void getWorldTransform(btTransform& worldTrans) const override;
+ virtual void getWorldTransform(btTransform& worldTrans) const override;
Vector3 linearAcceleration_;
Vector3 linearVelocity_;
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/MovableEntity.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/MovableEntity.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/MovableEntity.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -51,9 +51,9 @@
using WorldEntity::setPosition;
using WorldEntity::setOrientation;
- inline void setPosition(const Vector3& position) override
+ virtual inline void setPosition(const Vector3& position) override
{ MobileEntity::setPosition(position); this->overwrite_position_ = this->getPosition(); }
- inline void setOrientation(const Quaternion& orientation) override
+ virtual inline void setOrientation(const Quaternion& orientation) override
{ MobileEntity::setOrientation(orientation); this->overwrite_orientation_ = this->getOrientation(); }
inline void setOwner(Pawn* owner)
@@ -78,8 +78,8 @@
private:
void registerVariables();
- void clientConnected(unsigned int clientID) override;
- void clientDisconnected(unsigned int clientID) override;
+ virtual void clientConnected(unsigned int clientID) override;
+ virtual void clientDisconnected(unsigned int clientID) override;
void resynchronize();
inline void processLinearVelocity()
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/StaticEntity.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/StaticEntity.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/StaticEntity.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -54,12 +54,12 @@
using WorldEntity::setPosition;
using WorldEntity::setOrientation;
- void setPosition(const Vector3& position) override;
- void setOrientation(const Quaternion& orientation) override;
+ virtual void setPosition(const Vector3& position) override;
+ virtual void setOrientation(const Quaternion& orientation) override;
private:
void registerVariables();
- bool isCollisionTypeLegal(CollisionType type) const override;
+ virtual bool isCollisionTypeLegal(CollisionType type) const override;
// network callbacks
inline void positionChanged()
@@ -68,8 +68,8 @@
{ this->setOrientation(this->getOrientation()); }
// Bullet btMotionState related
- void setWorldTransform(const btTransform& worldTrans) override;
- void getWorldTransform(btTransform& worldTrans) const override;
+ virtual void setWorldTransform(const btTransform& worldTrans) override;
+ virtual void getWorldTransform(btTransform& worldTrans) const override;
};
}
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.h 2015-11-23 20:12:23 UTC (rev 10844)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.h 2015-11-23 21:20:29 UTC (rev 10845)
@@ -68,7 +68,7 @@
virtual void fire();
- bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
+ virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
virtual void addedWeaponPack(WeaponPack* wPack);
More information about the Orxonox-commit
mailing list