[Orxonox-commit 6159] r10817 - in code/branches/cpp11_v2/src: libraries/core libraries/core/class libraries/core/command libraries/core/commandline libraries/core/config libraries/core/input libraries/core/module libraries/core/object libraries/core/singleton libraries/network libraries/network/packet libraries/network/synchronisable libraries/tools libraries/util libraries/util/output modules/designtools modules/docking modules/dodgerace modules/gametypes modules/invader modules/jump modules/mini4dgame modules/notifications modules/objects modules/overlays modules/overlays/debugging modules/overlays/hud modules/overlays/stats modules/pickup modules/pong modules/portals modules/questsystem modules/questsystem/effects modules/tetris modules/towerdefense modules/weapons modules/weapons/projectiles modules/weapons/weaponmodes orxonox orxonox/chat orxonox/collisionshapes orxonox/controllers orxonox/gamestates orxonox/gametypes orxonox/graphics orxonox/infos orxonox/interfaces orxonox/items orxonox/overlays orxonox/sound orxonox/weaponsystem orxonox/worldentities orxonox/worldentities/pawns
muemart at orxonox.net
muemart at orxonox.net
Thu Nov 19 11:40:30 CET 2015
Author: muemart
Date: 2015-11-19 11:40:28 +0100 (Thu, 19 Nov 2015)
New Revision: 10817
Modified:
code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.cc
code/branches/cpp11_v2/src/libraries/core/Core.h
code/branches/cpp11_v2/src/libraries/core/CoreIncludes.h
code/branches/cpp11_v2/src/libraries/core/CoreStaticInitializationHandler.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/LuaState.cc
code/branches/cpp11_v2/src/libraries/core/Namespace.h
code/branches/cpp11_v2/src/libraries/core/Template.h
code/branches/cpp11_v2/src/libraries/core/XMLPort.h
code/branches/cpp11_v2/src/libraries/core/class/Identifier.h
code/branches/cpp11_v2/src/libraries/core/class/Super.h
code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandIncludes.h
code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.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/commandline/CommandLineIncludes.h
code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc
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/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/module/StaticInitializationHandlerIncludes.h
code/branches/cpp11_v2/src/libraries/core/object/DestroyLaterManager.h
code/branches/cpp11_v2/src/libraries/core/object/IteratorBase.h
code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h
code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h
code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonIncludes.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/ClientConnection.h
code/branches/cpp11_v2/src/libraries/network/GamestateManager.h
code/branches/cpp11_v2/src/libraries/network/LANDiscoverable.cc
code/branches/cpp11_v2/src/libraries/network/NetworkFunction.h
code/branches/cpp11_v2/src/libraries/network/NetworkFunctionIncludes.h
code/branches/cpp11_v2/src/libraries/network/NetworkStaticInitializationHandler.h
code/branches/cpp11_v2/src/libraries/network/Server.h
code/branches/cpp11_v2/src/libraries/network/TrafficControl.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/FunctionIDs.h
code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.h
code/branches/cpp11_v2/src/libraries/network/packet/Welcome.h
code/branches/cpp11_v2/src/libraries/network/synchronisable/NetworkCallback.h
code/branches/cpp11_v2/src/libraries/network/synchronisable/SynchronisableVariable.h
code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h
code/branches/cpp11_v2/src/libraries/tools/DynamicLines.h
code/branches/cpp11_v2/src/libraries/tools/DynamicRenderable.h
code/branches/cpp11_v2/src/libraries/tools/ParticleInterface.h
code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.h
code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.h
code/branches/cpp11_v2/src/libraries/tools/Shader.h
code/branches/cpp11_v2/src/libraries/tools/Timer.h
code/branches/cpp11_v2/src/libraries/util/ExprParser.cc
code/branches/cpp11_v2/src/libraries/util/MultiType.h
code/branches/cpp11_v2/src/libraries/util/MultiTypeValue.h
code/branches/cpp11_v2/src/libraries/util/SharedPtr.h
code/branches/cpp11_v2/src/libraries/util/output/BaseWriter.h
code/branches/cpp11_v2/src/libraries/util/output/ConsoleWriter.h
code/branches/cpp11_v2/src/libraries/util/output/LogWriter.h
code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.h
code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h
code/branches/cpp11_v2/src/libraries/util/output/SubcontextOutputListener.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/docking/Dock.h
code/branches/cpp11_v2/src/modules/docking/DockToShip.h
code/branches/cpp11_v2/src/modules/docking/DockingController.h
code/branches/cpp11_v2/src/modules/docking/DockingTarget.h
code/branches/cpp11_v2/src/modules/docking/MoveToDockingTarget.h
code/branches/cpp11_v2/src/modules/dodgerace/DodgeRace.h
code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceCenterPoint.h
code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceHUDinfo.h
code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.h
code/branches/cpp11_v2/src/modules/gametypes/OldRaceCheckPoint.h
code/branches/cpp11_v2/src/modules/gametypes/OldSpaceRace.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/SpaceRaceController.h
code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.h
code/branches/cpp11_v2/src/modules/invader/Invader.h
code/branches/cpp11_v2/src/modules/invader/InvaderCenterPoint.h
code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h
code/branches/cpp11_v2/src/modules/invader/InvaderEnemyShooter.h
code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.h
code/branches/cpp11_v2/src/modules/invader/InvaderShip.h
code/branches/cpp11_v2/src/modules/invader/InvaderWeapon.h
code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.h
code/branches/cpp11_v2/src/modules/jump/Jump.cc
code/branches/cpp11_v2/src/modules/jump/Jump.h
code/branches/cpp11_v2/src/modules/jump/JumpBoots.h
code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.h
code/branches/cpp11_v2/src/modules/jump/JumpEnemy.h
code/branches/cpp11_v2/src/modules/jump/JumpFigure.cc
code/branches/cpp11_v2/src/modules/jump/JumpFigure.h
code/branches/cpp11_v2/src/modules/jump/JumpItem.h
code/branches/cpp11_v2/src/modules/jump/JumpPlatform.h
code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.h
code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.h
code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.h
code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.h
code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.h
code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.h
code/branches/cpp11_v2/src/modules/jump/JumpProjectile.h
code/branches/cpp11_v2/src/modules/jump/JumpPropeller.h
code/branches/cpp11_v2/src/modules/jump/JumpRocket.h
code/branches/cpp11_v2/src/modules/jump/JumpScore.h
code/branches/cpp11_v2/src/modules/jump/JumpShield.h
code/branches/cpp11_v2/src/modules/jump/JumpSpring.h
code/branches/cpp11_v2/src/modules/mini4dgame/Mini4Dgame.h
code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameBoard.h
code/branches/cpp11_v2/src/modules/notifications/NotificationDispatcher.h
code/branches/cpp11_v2/src/modules/notifications/NotificationManager.h
code/branches/cpp11_v2/src/modules/notifications/NotificationQueue.h
code/branches/cpp11_v2/src/modules/notifications/NotificationQueueCEGUI.h
code/branches/cpp11_v2/src/modules/objects/Attacher.h
code/branches/cpp11_v2/src/modules/objects/ForceField.h
code/branches/cpp11_v2/src/modules/objects/Planet.h
code/branches/cpp11_v2/src/modules/objects/Script.h
code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.h
code/branches/cpp11_v2/src/modules/objects/Turret.h
code/branches/cpp11_v2/src/modules/overlays/FadeoutText.h
code/branches/cpp11_v2/src/modules/overlays/GUIOverlay.h
code/branches/cpp11_v2/src/modules/overlays/OverlayText.h
code/branches/cpp11_v2/src/modules/overlays/debugging/DebugFPSText.h
code/branches/cpp11_v2/src/modules/overlays/debugging/DebugPositionText.h
code/branches/cpp11_v2/src/modules/overlays/debugging/DebugRTRText.h
code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.h
code/branches/cpp11_v2/src/modules/overlays/hud/ChatOverlay.h
code/branches/cpp11_v2/src/modules/overlays/hud/CountDown.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/HUDBar.h
code/branches/cpp11_v2/src/modules/overlays/hud/HUDBoostBar.h
code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.cc
code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.h
code/branches/cpp11_v2/src/modules/overlays/hud/HUDHealthBar.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/HUDSpeedBar.h
code/branches/cpp11_v2/src/modules/overlays/hud/HUDTimer.h
code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.h
code/branches/cpp11_v2/src/modules/overlays/hud/LastManStandingInfos.h
code/branches/cpp11_v2/src/modules/overlays/hud/LastTeamStandingInfos.h
code/branches/cpp11_v2/src/modules/overlays/hud/PauseNotice.h
code/branches/cpp11_v2/src/modules/overlays/hud/TeamBaseMatchScore.h
code/branches/cpp11_v2/src/modules/overlays/stats/Scoreboard.h
code/branches/cpp11_v2/src/modules/overlays/stats/Stats.h
code/branches/cpp11_v2/src/modules/pickup/CollectiblePickup.h
code/branches/cpp11_v2/src/modules/pickup/Pickup.h
code/branches/cpp11_v2/src/modules/pickup/PickupCollection.h
code/branches/cpp11_v2/src/modules/pickup/PickupManager.h
code/branches/cpp11_v2/src/modules/pickup/PickupRepresentation.h
code/branches/cpp11_v2/src/modules/pickup/PickupSpawner.h
code/branches/cpp11_v2/src/modules/pong/Pong.h
code/branches/cpp11_v2/src/modules/pong/PongAI.h
code/branches/cpp11_v2/src/modules/pong/PongBall.h
code/branches/cpp11_v2/src/modules/pong/PongBat.h
code/branches/cpp11_v2/src/modules/pong/PongCenterpoint.h
code/branches/cpp11_v2/src/modules/pong/PongScore.h
code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.h
code/branches/cpp11_v2/src/modules/portals/PortalLink.h
code/branches/cpp11_v2/src/modules/questsystem/GlobalQuest.h
code/branches/cpp11_v2/src/modules/questsystem/LocalQuest.h
code/branches/cpp11_v2/src/modules/questsystem/Quest.h
code/branches/cpp11_v2/src/modules/questsystem/QuestDescription.h
code/branches/cpp11_v2/src/modules/questsystem/QuestEffectBeacon.h
code/branches/cpp11_v2/src/modules/questsystem/QuestHint.h
code/branches/cpp11_v2/src/modules/questsystem/QuestItem.h
code/branches/cpp11_v2/src/modules/questsystem/QuestListener.h
code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuest.h
code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuestHint.h
code/branches/cpp11_v2/src/modules/questsystem/effects/AddReward.h
code/branches/cpp11_v2/src/modules/questsystem/effects/ChangeQuestStatus.h
code/branches/cpp11_v2/src/modules/questsystem/effects/CompleteQuest.h
code/branches/cpp11_v2/src/modules/questsystem/effects/FailQuest.h
code/branches/cpp11_v2/src/modules/tetris/Tetris.h
code/branches/cpp11_v2/src/modules/tetris/TetrisBrick.h
code/branches/cpp11_v2/src/modules/tetris/TetrisCenterpoint.h
code/branches/cpp11_v2/src/modules/tetris/TetrisScore.h
code/branches/cpp11_v2/src/modules/towerdefense/TowerDefense.h
code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseCenterpoint.h
code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.h
code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseField.h
code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseHUDController.h
code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseSelecter.h
code/branches/cpp11_v2/src/modules/weapons/IceGunFreezer.h
code/branches/cpp11_v2/src/modules/weapons/RocketController.cc
code/branches/cpp11_v2/src/modules/weapons/RocketController.h
code/branches/cpp11_v2/src/modules/weapons/projectiles/BillboardProjectile.h
code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBomb.h
code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBombField.h
code/branches/cpp11_v2/src/modules/weapons/projectiles/IceGunProjectile.h
code/branches/cpp11_v2/src/modules/weapons/projectiles/LightningGunProjectile.h
code/branches/cpp11_v2/src/modules/weapons/projectiles/ParticleProjectile.h
code/branches/cpp11_v2/src/modules/weapons/projectiles/Projectile.h
code/branches/cpp11_v2/src/modules/weapons/projectiles/Rocket.h
code/branches/cpp11_v2/src/modules/weapons/projectiles/RocketOld.h
code/branches/cpp11_v2/src/modules/weapons/projectiles/SimpleRocket.h
code/branches/cpp11_v2/src/modules/weapons/weaponmodes/EnergyDrink.h
code/branches/cpp11_v2/src/modules/weapons/weaponmodes/FusionFire.h
code/branches/cpp11_v2/src/modules/weapons/weaponmodes/GravityBombFire.h
code/branches/cpp11_v2/src/modules/weapons/weaponmodes/HsW01.h
code/branches/cpp11_v2/src/modules/weapons/weaponmodes/IceGun.h
code/branches/cpp11_v2/src/modules/weapons/weaponmodes/LaserFire.h
code/branches/cpp11_v2/src/modules/weapons/weaponmodes/LightningGun.h
code/branches/cpp11_v2/src/modules/weapons/weaponmodes/RocketFire.h
code/branches/cpp11_v2/src/modules/weapons/weaponmodes/RocketFireOld.h
code/branches/cpp11_v2/src/modules/weapons/weaponmodes/SimpleRocketFire.h
code/branches/cpp11_v2/src/modules/weapons/weaponmodes/SplitGun.h
code/branches/cpp11_v2/src/orxonox/Level.h
code/branches/cpp11_v2/src/orxonox/LevelInfo.h
code/branches/cpp11_v2/src/orxonox/PlayerManager.h
code/branches/cpp11_v2/src/orxonox/Radar.h
code/branches/cpp11_v2/src/orxonox/Scene.h
code/branches/cpp11_v2/src/orxonox/chat/ChatHistory.h
code/branches/cpp11_v2/src/orxonox/chat/ChatInputHandler.h
code/branches/cpp11_v2/src/orxonox/chat/ChatManager.h
code/branches/cpp11_v2/src/orxonox/collisionshapes/CollisionShape.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/controllers/AIController.h
code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.h
code/branches/cpp11_v2/src/orxonox/controllers/Controller.h
code/branches/cpp11_v2/src/orxonox/controllers/ControllerDirector.h
code/branches/cpp11_v2/src/orxonox/controllers/DroneController.h
code/branches/cpp11_v2/src/orxonox/controllers/FormationController.h
code/branches/cpp11_v2/src/orxonox/controllers/HumanController.h
code/branches/cpp11_v2/src/orxonox/controllers/NewHumanController.h
code/branches/cpp11_v2/src/orxonox/controllers/ScriptController.h
code/branches/cpp11_v2/src/orxonox/controllers/WaypointController.h
code/branches/cpp11_v2/src/orxonox/controllers/WaypointPatrolController.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/Asteroids.h
code/branches/cpp11_v2/src/orxonox/gametypes/Deathmatch.h
code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.h
code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.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/Mission.h
code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.h
code/branches/cpp11_v2/src/orxonox/gametypes/TeamDeathmatch.h
code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.h
code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.h
code/branches/cpp11_v2/src/orxonox/graphics/AnimatedModel.h
code/branches/cpp11_v2/src/orxonox/graphics/Backlight.h
code/branches/cpp11_v2/src/orxonox/graphics/Billboard.h
code/branches/cpp11_v2/src/orxonox/graphics/BlinkingBillboard.h
code/branches/cpp11_v2/src/orxonox/graphics/Camera.h
code/branches/cpp11_v2/src/orxonox/graphics/FadingBillboard.h
code/branches/cpp11_v2/src/orxonox/graphics/GlobalShader.h
code/branches/cpp11_v2/src/orxonox/graphics/Light.h
code/branches/cpp11_v2/src/orxonox/graphics/MeshLodInformation.h
code/branches/cpp11_v2/src/orxonox/graphics/Model.h
code/branches/cpp11_v2/src/orxonox/graphics/ParticleEmitter.h
code/branches/cpp11_v2/src/orxonox/graphics/ParticleSpawner.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/infos/PlayerInfo.h
code/branches/cpp11_v2/src/orxonox/interfaces/PickupCarrier.h
code/branches/cpp11_v2/src/orxonox/interfaces/Pickupable.h
code/branches/cpp11_v2/src/orxonox/items/Engine.h
code/branches/cpp11_v2/src/orxonox/items/MultiStateEngine.h
code/branches/cpp11_v2/src/orxonox/items/PartDestructionEvent.h
code/branches/cpp11_v2/src/orxonox/items/ShipPart.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/overlays/OverlayGroup.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/weaponsystem/DefaultWeaponmodeLink.h
code/branches/cpp11_v2/src/orxonox/weaponsystem/Weapon.h
code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponMode.h
code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponPack.h
code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSet.h
code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.h
code/branches/cpp11_v2/src/orxonox/worldentities/CameraPosition.h
code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.h
code/branches/cpp11_v2/src/orxonox/worldentities/Drone.h
code/branches/cpp11_v2/src/orxonox/worldentities/EffectContainer.h
code/branches/cpp11_v2/src/orxonox/worldentities/ExplosionChunk.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/SpawnPoint.h
code/branches/cpp11_v2/src/orxonox/worldentities/StaticEntity.h
code/branches/cpp11_v2/src/orxonox/worldentities/TeamSpawnPoint.h
code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.h
code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.h
Log:
Run clang-modernize -add-override
A few notes:
- There are probably some overrides missing, especially in funky templatey code
- Virtual methods with wrong signatures were not fixed, needs to be done by hand (only warnings get emitted)
Modified: code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.cc 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.cc 2015-11-19 10:40:28 UTC (rev 10817)
@@ -53,6 +53,7 @@
#include "util/Output.h"
#include "util/Exception.h"
#include "commandline/CommandLineIncludes.h"
+#include "core/ApplicationPaths.h"
// Differentiate Boost Filesystem v2 and v3
#if (BOOST_FILESYSTEM_VERSION < 3)
Modified: code/branches/cpp11_v2/src/libraries/core/Core.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Core.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/Core.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -44,6 +44,7 @@
#include "CorePrereqs.h"
#include <string>
+#include <list>
#include "util/DestructionHelper.h"
#include "util/Singleton.h"
#include "CoreConfig.h"
Modified: code/branches/cpp11_v2/src/libraries/core/CoreIncludes.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/CoreIncludes.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/CoreIncludes.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -220,7 +220,7 @@
template <class T>
struct InheritsFromClass : public Identifier::InheritsFrom
{
- virtual Identifier* getParent() const { return Class(T); }
+ virtual Identifier* getParent() const override { return Class(T); }
};
public:
@@ -230,12 +230,12 @@
{}
~StaticallyInitializedIdentifier() { delete identifier_; }
- virtual void load()
+ virtual void load() override
{
IdentifierManager::getInstance().addIdentifier(this->identifier_);
}
- virtual void unload()
+ virtual void unload() override
{
IdentifierManager::getInstance().removeIdentifier(this->identifier_);
}
Modified: code/branches/cpp11_v2/src/libraries/core/CoreStaticInitializationHandler.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/CoreStaticInitializationHandler.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/CoreStaticInitializationHandler.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -42,11 +42,11 @@
public:
CoreStaticInitializationHandler() : bInitInstances_(false) {}
- virtual void setupHandler();
- virtual void shutdownHandler();
+ virtual void setupHandler() override;
+ virtual void shutdownHandler() override;
- virtual void loadModule(ModuleInstance* module);
- virtual void unloadModule(ModuleInstance* module);
+ virtual void loadModule(ModuleInstance* module) override;
+ virtual void unloadModule(ModuleInstance* module) override;
inline void setInitInstances(bool bInitInstances)
{ this->bInitInstances_ = bInitInstances; }
Modified: code/branches/cpp11_v2/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/GUIManager.cc 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/GUIManager.cc 2015-11-19 10:40:28 UTC (rev 10817)
@@ -123,7 +123,7 @@
class CEGUILogger : public CEGUI::DefaultLogger
{
public:
- void logEvent(const CEGUI::String& message, CEGUI::LoggingLevel level = CEGUI::Standard)
+ 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)
+ 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)
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/GUIManager.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -168,19 +168,19 @@
void changedCeguiOutputLevel();
// keyHandler functions
- void buttonPressed (const KeyEvent& evt);
- void buttonReleased(const KeyEvent& evt);
+ void buttonPressed (const KeyEvent& evt) override;
+ void buttonReleased(const KeyEvent& evt) override;
// mouseHandler functions
- void buttonPressed (MouseButtonCode::ByEnum id);
- void buttonReleased(MouseButtonCode::ByEnum id);
- void mouseMoved (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize);
- void mouseScrolled (int abs, int rel);
+ 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;
void mouseLeft ();
// window event handler
- virtual void windowResized(unsigned int newWidth, unsigned int newHeight);
- virtual void windowFocusChanged(bool bFocus);
+ virtual void windowResized(unsigned int newWidth, unsigned int newHeight) override;
+ virtual void windowFocusChanged(bool bFocus) override;
#ifdef ORXONOX_OLD_CEGUI
CEGUI::OgreCEGUIRenderer* guiRenderer_; //!< CEGUI's interface to the Ogre Engine
Modified: code/branches/cpp11_v2/src/libraries/core/Game.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Game.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/Game.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -134,7 +134,7 @@
class TemplateGameStateFactory : public GameStateFactory
{
public:
- std::shared_ptr<GameState> fabricateInternal(const GameStateInfo& info)
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/GraphicsManager.cc 2015-11-19 10:40:28 UTC (rev 10817)
@@ -81,13 +81,13 @@
class OgreWindowEventListener : public Ogre::WindowEventListener
{
public:
- void windowResized (Ogre::RenderWindow* rw)
+ void windowResized (Ogre::RenderWindow* rw) override
{ orxonox::WindowEventListener::resizeWindow(rw->getWidth(), rw->getHeight()); }
- void windowFocusChange (Ogre::RenderWindow* rw)
+ void windowFocusChange (Ogre::RenderWindow* rw) override
{ orxonox::WindowEventListener::changeWindowFocus(rw->isActive()); }
- void windowClosed (Ogre::RenderWindow* rw)
+ void windowClosed (Ogre::RenderWindow* rw) override
{ orxonox::Game::getInstance().stop(); }
- void windowMoved (Ogre::RenderWindow* rw)
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -110,7 +110,7 @@
// 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);
+ 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);
#endif
Modified: code/branches/cpp11_v2/src/libraries/core/LuaState.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/LuaState.cc 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/LuaState.cc 2015-11-19 10:40:28 UTC (rev 10817)
@@ -32,7 +32,7 @@
#include <tolua++.h>
extern "C" {
#include <lua.h>
-#include <lualib.h>
+#include <lualib.h>
}
#include <loki/ScopeGuard.h>
Modified: code/branches/cpp11_v2/src/libraries/core/Namespace.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Namespace.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/Namespace.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -49,7 +49,7 @@
Namespace(Context* context);
virtual ~Namespace();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void loadObjects(BaseObject* object);
const BaseObject* saveObjects(unsigned int index) const;
Modified: code/branches/cpp11_v2/src/libraries/core/Template.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Template.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/Template.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -53,8 +53,8 @@
Template(Context* context);
virtual ~Template();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void changedName();
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void changedName() override;
inline void setLink(const std::string& link)
{ this->link_ = link; this->bIsLink_ = !link.empty(); }
Modified: code/branches/cpp11_v2/src/libraries/core/XMLPort.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/XMLPort.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/XMLPort.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -458,37 +458,37 @@
return (*this);
}
- virtual XMLPortParamContainer& defaultValue(unsigned int index, const MultiType& param)
+ virtual XMLPortParamContainer& defaultValue(unsigned int index, const MultiType& param) override
{
if (!this->loadexecutor_->defaultValueSet(index))
this->loadexecutor_->setDefaultValue(index, param);
return this->portIfWaitingForDefaultValues(this->parseResult_, this->parseParams_);
}
- virtual XMLPortParamContainer& defaultValues(const MultiType& param1)
+ virtual XMLPortParamContainer& defaultValues(const MultiType& param1) override
{
if (!this->loadexecutor_->defaultValueSet(0))
this->loadexecutor_->setDefaultValues(param1);
return this->portIfWaitingForDefaultValues(this->parseResult_, this->parseParams_);
}
- virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2)
+ virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2) override
{
if ((!this->loadexecutor_->defaultValueSet(0)) || (!this->loadexecutor_->defaultValueSet(1)))
this->loadexecutor_->setDefaultValues(param1, param2);
return this->portIfWaitingForDefaultValues(this->parseResult_, this->parseParams_);
}
- virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3)
+ virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3) override
{
if ((!this->loadexecutor_->defaultValueSet(0)) || (!this->loadexecutor_->defaultValueSet(1)) || (!this->loadexecutor_->defaultValueSet(2)))
this->loadexecutor_->setDefaultValues(param1, param2, param3);
return this->portIfWaitingForDefaultValues(this->parseResult_, this->parseParams_);
}
- virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4)
+ virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4) override
{
if ((!this->loadexecutor_->defaultValueSet(0)) || (!this->loadexecutor_->defaultValueSet(1)) || (!this->loadexecutor_->defaultValueSet(2)) || (!this->loadexecutor_->defaultValueSet(3)))
this->loadexecutor_->setDefaultValues(param1, param2, param3, param4);
return this->portIfWaitingForDefaultValues(this->parseResult_, this->parseParams_);
}
- virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4, const MultiType& param5)
+ virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4, const MultiType& param5) override
{
if ((!this->loadexecutor_->defaultValueSet(0)) || (!this->loadexecutor_->defaultValueSet(1)) || (!this->loadexecutor_->defaultValueSet(2)) || (!this->loadexecutor_->defaultValueSet(3)) || (!this->loadexecutor_->defaultValueSet(4)))
this->loadexecutor_->setDefaultValues(param1, param2, param3, param4, param5);
@@ -555,7 +555,7 @@
{
}
- void callLoadExecutor(BaseObject* object, BaseObject* newObject)
+ void callLoadExecutor(BaseObject* object, BaseObject* newObject) override
{
T* castObject = orxonox_cast<T*>(object);
assert(castObject);
Modified: code/branches/cpp11_v2/src/libraries/core/class/Identifier.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/class/Identifier.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/class/Identifier.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -288,15 +288,15 @@
bool initializeObject(T* object);
- virtual void updateConfigValues(bool updateChildren = true) const;
+ virtual void updateConfigValues(bool updateChildren = true) const override;
- virtual const std::type_info& getTypeInfo()
+ virtual const std::type_info& getTypeInfo() override
{ return typeid(T); }
- virtual bool canDynamicCastObjectToIdentifierClass(Identifiable* object) const
+ virtual bool canDynamicCastObjectToIdentifierClass(Identifiable* object) const override
{ return dynamic_cast<T*>(object) != nullptr; }
- virtual void destroyObjects();
+ virtual void destroyObjects() override;
static ClassIdentifier<T>* getIdentifier();
Modified: code/branches/cpp11_v2/src/libraries/core/class/Super.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/class/Super.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/class/Super.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -583,7 +583,7 @@
// Creates the super-function-callers by calling the first SuperFunctionCondition check
// This get's called within the initialization of an Identifier
- virtual void createSuperFunctionCaller() const
+ virtual void createSuperFunctionCaller() const override
{
SuperFunctionCondition<0, T, 0, 0>::superCheck();
}
Modified: code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandIncludes.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandIncludes.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandIncludes.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -315,8 +315,8 @@
{}
~StaticallyInitializedConsoleCommand() { delete command_; }
- virtual void load();
- virtual void unload();
+ virtual void load() override;
+ virtual void unload() override;
inline ConsoleCommand& getCommand()
{ return *this->command_; }
Modified: code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -38,6 +38,8 @@
#include "util/Singleton.h"
+#include <map>
+
namespace orxonox
{
/**
Modified: code/branches/cpp11_v2/src/libraries/core/command/Functor.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/Functor.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/command/Functor.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -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)
+ 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
+ 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)
+ inline void setRawObjectPointer(void* object) override
{ this->setObject((O*)object); }
// see Functor::getRawObjectPointer()
- inline void* getRawObjectPointer() const
+ inline void* getRawObjectPointer() const override
{ return this->object_; }
// see Functor::setSafeMode()
- inline void setSafeMode(bool bSafeMode)
+ 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()
+ 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)
+ 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
+ inline Functor::Type::Enum getType() const override
{ return Functor::Type::Static; }
// see Functor::setRawObjectPointer()
- inline void setRawObjectPointer(void*)
+ 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
+ inline void* getRawObjectPointer() const override
{ return nullptr; }
// see Functor::setSafeMode()
- inline void setSafeMode(bool) {}
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/command/IOConsolePOSIX.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -64,12 +64,12 @@
static int extractLogLevel(std::string* text);
// Methods from ShellListener
- void linesChanged();
- void lineAdded();
- void inputChanged();
- void cursorChanged();
- void executed();
- void exit();
+ void linesChanged() override;
+ void lineAdded() override;
+ void inputChanged() override;
+ void cursorChanged() override;
+ void executed() override;
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/command/IOConsoleWindows.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -66,12 +66,12 @@
static int extractLogLevel(std::string* text);
// Methods from ShellListener
- void linesChanged();
- void lineAdded();
- void inputChanged();
- void cursorChanged();
- void executed();
- void exit();
+ void linesChanged() override;
+ void lineAdded() override;
+ void inputChanged() override;
+ void cursorChanged() override;
+ void executed() override;
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/command/Shell.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -150,13 +150,13 @@
Shell(const Shell& other);
// DevModeListener
- void devModeChanged(bool value);
+ void devModeChanged(bool value) override;
void addToHistory(const std::string& command);
const std::string& getFromHistory() const;
void clearInput();
// BaseWriter
- virtual void printLine(const std::string& line, OutputLevel level);
+ virtual void printLine(const std::string& line, OutputLevel level) override;
void configureInputBuffer();
Modified: code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineIncludes.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineIncludes.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineIncludes.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -63,10 +63,10 @@
{}
~StaticallyInitializedCommandLineArgument() { delete argument_; }
- virtual void load()
+ virtual void load() override
{ CommandLineParser::addArgument(this->argument_); }
- virtual void unload()
+ virtual void unload() override
{ CommandLineParser::removeArgument(this->argument_); }
inline CommandLineArgument& getArgument()
Modified: code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc 2015-11-19 10:40:28 UTC (rev 10817)
@@ -37,6 +37,7 @@
#include <iterator>
#include <algorithm>
+#include <fstream>
#include "util/Convert.h"
#include "util/StringUtils.h"
Modified: code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryComment.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryComment.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryComment.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -55,21 +55,21 @@
/// Destructor
inline virtual ~ConfigFileEntryComment() {}
- inline virtual const std::string& getName() const
+ inline virtual const std::string& getName() const override
{ return this->comment_; }
- inline virtual void setComment(const std::string& comment)
+ inline virtual void setComment(const std::string& comment) override
{ this->comment_ = comment; }
- inline virtual void setValue(const std::string& value)
+ inline virtual void setValue(const std::string& value) override
{}
- inline virtual const std::string& getValue() const
+ inline virtual const std::string& getValue() const override
{ return BLANKSTRING; }
- inline void setString(bool bString)
+ inline void setString(bool bString) override
{}
- inline virtual const std::string& getFileEntry() const
+ inline virtual 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryValue.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -68,21 +68,21 @@
/// Destructor
inline virtual ~ConfigFileEntryValue() {}
- inline virtual const std::string& getName() const
+ inline virtual const std::string& getName() const override
{ return this->name_; }
- inline virtual void setComment(const std::string& comment)
+ inline virtual void setComment(const std::string& comment) override
{ this->additionalComment_ = comment; this->update(); }
- inline virtual void setValue(const std::string& value)
+ inline virtual void setValue(const std::string& value) override
{ this->value_ = value; this->update(); }
- inline virtual const std::string& getValue() const
+ inline virtual const std::string& getValue() const override
{ return this->value_; }
- inline void virtual setString(bool bString)
+ inline void virtual setString(bool bString) override
{ this->bString_ = bString; this->update(); }
- inline virtual const std::string& getFileEntry() const
+ inline virtual 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)
Modified: code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryVectorValue.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryVectorValue.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryVectorValue.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -66,15 +66,15 @@
/// Destructor
inline ~ConfigFileEntryVectorValue() {}
- inline unsigned int getIndex() const
+ 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
+ inline const std::string& getKeyString() const override
{ return this->keyString_; }
private:
- void update();
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -67,7 +67,7 @@
public:
inline ConfigValueCallback(void (T::*function) (void)) : function_(function) {}
inline virtual ~ConfigValueCallback() {}
- inline virtual void call(void* object)
+ inline virtual void call(void* object) override
{
if (!IdentifierManager::getInstance().isCreatingHierarchy())
(static_cast<T*>(object)->*this->function_)();
Modified: code/branches/cpp11_v2/src/libraries/core/input/HalfAxis.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/HalfAxis.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/input/HalfAxis.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -55,8 +55,8 @@
{ }
using Button::execute;
bool execute();
- bool addParamCommand(ParamCommand* command);
- void clear();
+ bool addParamCommand(ParamCommand* command) override;
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/input/InputBuffer.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -65,7 +65,7 @@
listener_(listener), function_(function)
{ }
virtual ~InputBufferListenerTuple() { }
- void callFunction()
+ void callFunction() override
{
(listener_->*function_)();
}
@@ -164,15 +164,15 @@
inline void decreaseCursor()
{ if (this->cursor_ > 0) { --this->cursor_; } }
- void buttonPressed(const KeyEvent& evt);
+ void buttonPressed(const KeyEvent& evt) override;
private:
bool charIsAllowed(const char& input);
- void buttonHeld (const KeyEvent& evt);
+ void buttonHeld (const KeyEvent& evt) override;
void processKey (const KeyEvent& evt);
- void keyboardUpdated(float dt);
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/input/InputCommands.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -75,9 +75,9 @@
class _CoreExport SimpleCommand : public BaseCommand
{
public:
- bool execute(float abs = 1.0f, float rel = 1.0f);
- CommandEvaluation* getEvaluation();
- virtual SimpleCommand* clone() { return new SimpleCommand(*this); }
+ bool execute(float abs = 1.0f, float rel = 1.0f) override;
+ CommandEvaluation* getEvaluation() override;
+ virtual SimpleCommand* clone() override { return new SimpleCommand(*this); }
CommandEvaluation evaluation_;
};
@@ -103,9 +103,9 @@
{
public:
ParamCommand() : scale_(1.0f), paramCommand_(nullptr) { }
- bool execute(float abs = 1.0f, float rel = 1.0f);
- CommandEvaluation* getEvaluation();
- virtual ParamCommand* clone() { return new ParamCommand(*this); }
+ bool execute(float abs = 1.0f, float rel = 1.0f) override;
+ CommandEvaluation* getEvaluation() override;
+ virtual ParamCommand* clone() override { return new ParamCommand(*this); }
float scale_;
BufferedParamCommand* paramCommand_;
Modified: code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -152,14 +152,14 @@
}
//! Captures OIS events (which then get distributed to the derived class) and creates the button held events
- void update(const Clock& time)
+ void update(const Clock& time) override
{
oisDevice_->capture();
// Call all the states with the held button event
for (unsigned int iB = 0; iB < pressedButtons_.size(); ++iB)
for (unsigned int iS = 0; iS < inputStates_.size(); ++iS)
- inputStates_[iS]->buttonEvent<ButtonEvent::THold, typename Traits::ButtonTypeParam>(
+ inputStates_[iS]->template buttonEvent<ButtonEvent::THold, typename Traits::ButtonTypeParam>(
this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(pressedButtons_[iB]));
// Call states with device update events
@@ -170,7 +170,7 @@
}
//! Clears the list of pressed buttons and calls the derived class's method
- void clearBuffers()
+ 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 { return DeviceClass::getClassNameImpl(); }
+ 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)
@@ -196,7 +196,7 @@
// Call states
for (unsigned int i = 0; i < inputStates_.size(); ++i)
- inputStates_[i]->buttonEvent<ButtonEvent::TPress, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
+ inputStates_[i]->template buttonEvent<ButtonEvent::TPress, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
}
//! Common code for all button released events (updates pressed buttons list and calls the input states)
@@ -218,7 +218,7 @@
// Call states
for (unsigned int i = 0; i < inputStates_.size(); ++i)
- inputStates_[i]->buttonEvent<ButtonEvent::TRelease, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
+ inputStates_[i]->template buttonEvent<ButtonEvent::TRelease, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
}
//! Managed pointer to the OIS device
Modified: code/branches/cpp11_v2/src/libraries/core/input/InputManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/InputManager.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/input/InputManager.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -207,7 +207,7 @@
void updateActiveStates();
// From WindowEventListener
- void windowFocusChanged(bool bFocus);
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/input/InputState.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -156,7 +156,7 @@
InputState(const std::string& name, bool bAlwaysGetsInput, bool bTransparent, InputStatePriority priority);
~InputState() { }
- void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList);
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/input/JoyStick.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -76,8 +76,8 @@
const std::string& getDeviceName() const { return this->deviceName_; }
private:
- void calibrationStarted();
- void calibrationStopped();
+ void calibrationStarted() override;
+ 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)
+ 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)
+ 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);
- bool sliderMoved (const OIS::JoyStickEvent &arg, int id);
- bool povMoved (const OIS::JoyStickEvent &arg, int id);
+ 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;
//! OIS event handler (don't remove that because of OIS version issues!)
- bool vector3Moved (const OIS::JoyStickEvent &arg, int id) { return true; }
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -83,28 +83,28 @@
void initialiseJoyStickBindings();
void compilePointerLists();
// from JoyStickQuantityListener interface
- virtual void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList);
+ virtual void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;
- void allDevicesUpdated(float dt);
- void mouseUpdated(float dt);
- void joyStickUpdated(unsigned int joyStick, float dt);
+ void allDevicesUpdated(float dt) override;
+ void mouseUpdated(float dt) override;
+ void joyStickUpdated(unsigned int joyStick, float dt) override;
// internal
void tickHalfAxis(HalfAxis& halfAxis);
- void buttonPressed (const KeyEvent& evt);
- void buttonReleased(const KeyEvent& evt);
- void buttonHeld (const KeyEvent& evt);
+ void buttonPressed (const KeyEvent& evt) override;
+ void buttonReleased(const KeyEvent& evt) override;
+ void buttonHeld (const KeyEvent& evt) override;
- void buttonPressed (MouseButtonCode::ByEnum button);
- void buttonReleased(MouseButtonCode::ByEnum button);
- void buttonHeld (MouseButtonCode::ByEnum button);
- void mouseMoved (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize);
- void mouseScrolled (int abs, int rel);
+ 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;
- void buttonPressed (unsigned int device, JoyStickButtonCode::ByEnum button);
- void buttonReleased(unsigned int device, JoyStickButtonCode::ByEnum button);
- void buttonHeld (unsigned int device, JoyStickButtonCode::ByEnum button);
- void axisMoved (unsigned int device, unsigned int axis, float value);
+ 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;
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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/input/KeyDetector.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -50,7 +50,7 @@
KeyDetector(const KeyDetector&);
void callback(const std::string& name);
- void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList);
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/input/Keyboard.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -74,8 +74,8 @@
return button;
}
- bool keyPressed(const OIS::KeyEvent& arg);
- bool keyReleased(const OIS::KeyEvent& arg);
+ bool keyPressed(const OIS::KeyEvent& arg) override;
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/input/Mouse.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -73,22 +73,22 @@
private:
//! OIS event handler
- bool mousePressed(const OIS::MouseEvent &arg, OIS::MouseButtonID id)
+ 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)
+ 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);
+ bool mouseMoved(const OIS::MouseEvent &arg) override;
- void windowResized(unsigned int newWidth, unsigned int newHeight);
+ 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/module/StaticInitializationHandlerIncludes.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/module/StaticInitializationHandlerIncludes.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/module/StaticInitializationHandlerIncludes.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -52,8 +52,8 @@
{}
~StaticallyInitializedStaticInitializationHandler() { delete handler_; }
- virtual void load();
- virtual void unload();
+ virtual void load() override;
+ virtual void unload() override;
inline StaticInitializationHandler& getHandler()
{ return *this->handler_; }
Modified: code/branches/cpp11_v2/src/libraries/core/object/DestroyLaterManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/object/DestroyLaterManager.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/object/DestroyLaterManager.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -44,8 +44,8 @@
DestroyLaterManager();
virtual ~DestroyLaterManager();
- virtual void preUpdate(const Clock& time) { /*no action*/ }
- virtual void postUpdate(const Clock& time);
+ virtual void preUpdate(const Clock& time) override { /*no action*/ }
+ virtual void postUpdate(const Clock& time) override;
void retain(Destroyable* instance)
{ this->retainedInstances_.push_back(instance); }
Modified: code/branches/cpp11_v2/src/libraries/core/object/IteratorBase.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/object/IteratorBase.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/object/IteratorBase.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -174,7 +174,7 @@
@brief Increments the Iterator if it points at the given element.
@param object The object to compare with
*/
- virtual void removedElement(ObjectListBaseElement* element)
+ virtual void removedElement(ObjectListBaseElement* element) override
{
if (this->element_ == element)
this->operator++();
Modified: code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -81,7 +81,7 @@
public:
ObjectListElement(T* object) : ObjectListBaseElement(static_cast<Listable*>(object)), object_(object) {}
- virtual void changeContext(Context* oldContext, Context* newContext)
+ virtual void changeContext(Context* oldContext, Context* newContext) override
{
// add object to new context, but only if this element belongs exactly to the old context (and not to a sub-context to avoid re-adding objects
// multiple times if they are in multiple contexts)
Modified: code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -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()
+ inline void objectDeleted() override
{
this->base_ = nullptr;
this->pointer_ = nullptr;
Modified: code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonIncludes.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonIncludes.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonIncludes.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -86,8 +86,8 @@
{}
~StaticallyInitializedScopedSingletonWrapper() { delete wrapper_; }
- virtual void load();
- virtual void unload();
+ virtual void load() override;
+ virtual void unload() override;
inline ScopedSingletonWrapper& getWrapper()
{ return *this->wrapper_; }
Modified: code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonWrapper.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonWrapper.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonWrapper.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -101,14 +101,14 @@
}
//! Called if the Scope of the Singleton gets active (creates the instance)
- void activated()
+ void activated() override
{
assert(singletonPtr_ == nullptr);
singletonPtr_ = new T();
}
//! Called if the Scope of this Singleton gets deactivated (destroys the instance)
- void deactivated()
+ 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()
+ 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()
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/network/Client.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -75,22 +75,22 @@
static Client* getInstance(){ return singletonPtr_s; } // tolua_export
- bool establishConnection();
+ bool establishConnection() override;
void setDestination( const std::string& serverAddress, unsigned int port ); // tolua_export
- bool closeConnection();
- void queuePacket(ENetPacket* packet, int clientID, uint8_t channelID);
- virtual bool sendPacket( packet::Packet* packet ){ return packet->send( static_cast<Host*>(this) ); }
- virtual void doSendChat(const std::string& message, unsigned int sourceID, unsigned int targetID);
- virtual void doReceiveChat(const std::string& message, unsigned int sourceID, unsigned int targetID);
- virtual void printRTT();
+ bool closeConnection() override;
+ 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;
+ virtual void printRTT() override;
void update(const Clock& time);
protected:
- virtual void connectionClosed();
+ virtual void connectionClosed() override;
private:
Client(const Client& copy); // not used
- virtual bool isServer_(){return false;}
- void processPacket(packet::Packet* packet);
+ virtual bool isServer_() override{return false;}
+ void processPacket(packet::Packet* packet) override;
static Client* singletonPtr_s;
bool isSynched_;
Modified: code/branches/cpp11_v2/src/libraries/network/ClientConnection.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/ClientConnection.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/network/ClientConnection.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -56,8 +56,8 @@
virtual void connectionClosed()=0;
uint32_t getRTT();
private:
- virtual void addPeer(uint32_t peerID);
- virtual void removePeer(uint32_t peerID);
+ virtual void addPeer(uint32_t peerID) override;
+ virtual void removePeer(uint32_t peerID) override;
bool disconnectConnection();
// enet stuff
Modified: code/branches/cpp11_v2/src/libraries/network/GamestateManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/GamestateManager.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/network/GamestateManager.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -82,10 +82,10 @@
GamestateManager();
~GamestateManager();
- virtual bool addGamestate(packet::Gamestate *gs, unsigned int peerID);
- virtual bool ackGamestate(unsigned int gamestateID, unsigned int peerID);
- virtual uint32_t getLastReceivedGamestateID( unsigned int peerID );
- virtual uint32_t getCurrentGamestateID(){ if( currentGamestate_) return currentGamestate_->getID(); else return GAMESTATEID_INITIAL; }
+ virtual bool addGamestate(packet::Gamestate *gs, unsigned int peerID) override;
+ virtual bool ackGamestate(unsigned int gamestateID, unsigned int peerID) override;
+ virtual uint32_t getLastReceivedGamestateID( unsigned int peerID ) override;
+ virtual uint32_t getCurrentGamestateID() override{ if( currentGamestate_) return currentGamestate_->getID(); else return GAMESTATEID_INITIAL; }
bool processGamestates();
bool sendAck(unsigned int gamestateID, uint32_t peerID);
Modified: code/branches/cpp11_v2/src/libraries/network/LANDiscoverable.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/LANDiscoverable.cc 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/network/LANDiscoverable.cc 2015-11-19 10:40:28 UTC (rev 10817)
@@ -108,7 +108,7 @@
switch(event.type)
{
case ENET_EVENT_TYPE_CONNECT:
- orxout(verbose, context::network) << "Received LAN discovery connect from client " << event.peer->host->receivedAddress << endl;
+ //orxout(verbose, context::network) << "Received LAN discovery connect from client " << event.peer->host->receivedAddress << endl;
break;
case ENET_EVENT_TYPE_DISCONNECT:
case ENET_EVENT_TYPE_NONE:
@@ -116,7 +116,7 @@
case ENET_EVENT_TYPE_RECEIVE:
if( strcmp( LAN_DISCOVERY_MESSAGE, (char*)event.packet->data ) == 0 ) // check for a suitable orxonox client
{
- orxout(internal_info, context::network) << "Received LAN discovery message from client " << event.peer->host->receivedAddress << endl;
+ //orxout(internal_info, context::network) << "Received LAN discovery message from client " << event.peer->host->receivedAddress << endl;
packet::ServerInformation info;
info.setServerName(this->ownName);
info.setClientNumber(this->clientNumber);
Modified: code/branches/cpp11_v2/src/libraries/network/NetworkFunction.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/NetworkFunction.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/network/NetworkFunction.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -113,12 +113,12 @@
{ }
// ignore the objectID because its a static function
- virtual bool call(uint32_t objectID){ (*this->functor_)(); return true; }
- virtual bool call(uint32_t objectID, const MultiType& mt1){ (*this->functor_)(mt1); return true; }
- virtual bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2){ (*this->functor_)(mt1, mt2); return true; }
- virtual bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3){ (*this->functor_)(mt1, mt2, mt3); return true; }
- virtual bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4){ (*this->functor_)(mt1, mt2, mt3, mt4); return true; }
- virtual bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5){ (*this->functor_)(mt1, mt2, mt3, mt4, mt5); return true; }
+ virtual bool call(uint32_t objectID) override{ (*this->functor_)(); return true; }
+ virtual bool call(uint32_t objectID, const MultiType& mt1) override{ (*this->functor_)(mt1); return true; }
+ virtual bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2) override{ (*this->functor_)(mt1, mt2); return true; }
+ virtual bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3) override{ (*this->functor_)(mt1, mt2, mt3); return true; }
+ virtual bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4) override{ (*this->functor_)(mt1, mt2, mt3, mt4); return true; }
+ virtual bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5) override{ (*this->functor_)(mt1, mt2, mt3, mt4, mt5); return true; }
private:
FunctorStaticPtr functor_;
@@ -141,7 +141,7 @@
, functor_(functor)
{ }
- inline bool call(uint32_t objectID)
+ 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)
+ 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)
+ 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)
+ 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)
+ 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)
+ 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/NetworkFunctionIncludes.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/NetworkFunctionIncludes.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/network/NetworkFunctionIncludes.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -55,8 +55,8 @@
{}
~StaticallyInitializedNetworkFunction() { delete function_; }
- virtual void load();
- virtual void unload();
+ virtual void load() override;
+ virtual void unload() override;
inline NetworkFunctionBase& getFunction()
{ return *this->function_; }
Modified: code/branches/cpp11_v2/src/libraries/network/NetworkStaticInitializationHandler.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/NetworkStaticInitializationHandler.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/network/NetworkStaticInitializationHandler.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -38,11 +38,11 @@
class _NetworkExport NetworkStaticInitializationHandler : public StaticInitializationHandler
{
public:
- virtual void setupHandler();
- virtual void shutdownHandler();
+ virtual void setupHandler() override;
+ virtual void shutdownHandler() override;
- virtual void loadModule(ModuleInstance* module);
- virtual void unloadModule(ModuleInstance* module);
+ virtual void loadModule(ModuleInstance* module) override;
+ virtual void unloadModule(ModuleInstance* module) override;
};
}
Modified: code/branches/cpp11_v2/src/libraries/network/Server.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/Server.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/network/Server.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -60,11 +60,11 @@
void open();
void close();
- void queuePacket(ENetPacket *packet, int clientID, uint8_t channelID);
- virtual bool sendPacket( packet::Packet* packet ){ return packet->send( static_cast<Host*>(this) ); }
+ 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);
- virtual void printRTT();
+ virtual void printRTT() override;
float getPacketLoss(unsigned int clientID);
int getClientCount() { return this->clientIDs_.size();}
std::string getServerName() { return this->serverName_;}
@@ -72,20 +72,20 @@
protected:
void updateGamestate();
private:
- virtual bool isServer_(){return true;}
+ virtual bool isServer_() override{return true;}
unsigned int playerID(){return 0;}
- void addPeer(uint32_t peerID);
- void removePeer(uint32_t peerID);
- void processPacket(packet::Packet* packet);
+ void addPeer(uint32_t peerID) override;
+ void removePeer(uint32_t peerID) override;
+ void processPacket(packet::Packet* packet) override;
bool createClient(int clientID);
void disconnectClient( uint32_t clientID );
bool sendGameStates();
bool sendObjectDeletes();
bool isValidTarget(unsigned int targetID);
- virtual void doSendChat(const std::string& message, unsigned int sourceID, unsigned int targetID);
- virtual void doReceiveChat(const std::string& message, unsigned int sourceID, unsigned int targetID);
+ 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;
void syncClassid(unsigned int clientID);
float timeSinceLastUpdate_;
Modified: code/branches/cpp11_v2/src/libraries/network/TrafficControl.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/TrafficControl.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/network/TrafficControl.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -108,8 +108,8 @@
void ack(unsigned int clientID, unsigned int gamestateID); // this function gets called when the server receives an ack from the client
//ClientConnectionListener functions
- virtual void clientConnected(unsigned int clientID){};
- virtual void clientDisconnected(unsigned int clientID);
+ virtual void clientConnected(unsigned int clientID) override{};
+ virtual void clientDisconnected(unsigned int clientID) override;
protected:
Modified: code/branches/cpp11_v2/src/libraries/network/packet/Acknowledgement.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/packet/Acknowledgement.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/network/packet/Acknowledgement.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -45,8 +45,8 @@
Acknowledgement( uint8_t* data, unsigned int peerID );
~Acknowledgement();
- inline unsigned int getSize() const;
- virtual bool process(orxonox::Host* host);
+ inline unsigned int getSize() const override;
+ virtual bool process(orxonox::Host* host) override;
unsigned int getAckID();
private:
Modified: code/branches/cpp11_v2/src/libraries/network/packet/Chat.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/packet/Chat.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/network/packet/Chat.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -48,10 +48,10 @@
~Chat();
/* get size of packet */
- inline unsigned int getSize() const;
+ inline unsigned int getSize() const override;
/* process chat message packet and remove it afterwards */
- virtual bool process(orxonox::Host* host);
+ virtual bool process(orxonox::Host* host) override;
/* Get the length of the message (not the full size of the packet) */
unsigned int getMessageLength(){ return messageLength_; };
Modified: code/branches/cpp11_v2/src/libraries/network/packet/ClassID.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/packet/ClassID.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/network/packet/ClassID.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -46,8 +46,8 @@
ClassID( uint8_t* data, unsigned int clientID );
~ClassID();
- uint32_t getSize() const;
- virtual bool process(orxonox::Host* host);
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/network/packet/DeleteObjects.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -47,8 +47,8 @@
bool fetchIDs();
- inline unsigned int getSize() const;
- virtual bool process(orxonox::Host* host);
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/network/packet/FunctionCalls.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -51,12 +51,12 @@
FunctionCalls( uint8_t* data, unsigned int clientID );
~FunctionCalls();
- inline unsigned int getSize() const
+ inline unsigned int getSize() const override
{ assert(!this->isDataENetAllocated()); return currentSize_; }
- virtual bool process(orxonox::Host* host);
+ virtual bool process(orxonox::Host* host) override;
void addCall( uint32_t networkID, uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5);
- virtual bool send(orxonox::Host* host);
+ virtual bool send(orxonox::Host* host) override;
private:
std::queue<orxonox::FunctionCall> functionCalls_;
unsigned int clientID_;
Modified: code/branches/cpp11_v2/src/libraries/network/packet/FunctionIDs.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/packet/FunctionIDs.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/network/packet/FunctionIDs.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -46,8 +46,8 @@
FunctionIDs( uint8_t* data, unsigned int clientID );
~FunctionIDs();
- virtual uint32_t getSize() const;
- virtual bool process(orxonox::Host* host);
+ virtual uint32_t getSize() const override;
+ virtual bool process(orxonox::Host* host) override;
private:
};
Modified: code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -137,8 +137,8 @@
private:
// void rawDiff( uint8_t* newdata, uint8_t* data, uint8_t* basedata, uint32_t datalength, uint32_t baselength);
// inline uint32_t findObject( const SynchronisableHeader& header, uint8_t* mem, uint32_t dataLength, uint32_t startPosition = 0 );
- virtual uint32_t getSize() const;
- virtual bool process(orxonox::Host* host);
+ virtual uint32_t getSize() const override;
+ virtual bool process(orxonox::Host* host) override;
uint32_t calcGamestateSize(uint32_t id, uint8_t mode=0x0);
// inline void diffObject( uint8_t*& newData, uint8_t*& origData, uint8_t*& baseData, SynchronisableHeader& objectHeader, std::vector<uint32_t>::iterator& sizes );
// inline void copyObject( uint8_t*& newData, uint8_t*& origData, uint8_t*& baseData, SynchronisableHeader& objectHeader, std::vector<uint32_t>::iterator& sizes );
Modified: code/branches/cpp11_v2/src/libraries/network/packet/Welcome.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/packet/Welcome.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/network/packet/Welcome.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -44,9 +44,9 @@
Welcome( uint8_t* data, uint32_t clientID );
virtual ~Welcome();
- uint8_t *getData();
- inline unsigned int getSize() const;
- virtual bool process(orxonox::Host* host);
+ uint8_t *getData() override;
+ inline unsigned int getSize() const override;
+ virtual bool process(orxonox::Host* host) override;
private:
};
Modified: code/branches/cpp11_v2/src/libraries/network/synchronisable/NetworkCallback.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/synchronisable/NetworkCallback.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/network/synchronisable/NetworkCallback.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -52,7 +52,7 @@
public:
NetworkCallback(T* object, void (T::*function) (void)) : object_(object), function_(function) {}
virtual ~NetworkCallback() {}
- virtual void call()
+ virtual void call() override
{ (this->object_->*function_)(); }
private:
@@ -67,7 +67,7 @@
NetworkCallbackNotify(T* object, void (T::*function) (const U&)) : object_(object), function_(function) {}
NetworkCallbackNotify() {}
virtual ~NetworkCallbackNotify() {}
- virtual void call()
+ virtual void call() override
{ (this->object_->*function_)( this->oldValue_ ); }
void setOldValue(const U& value){ this->oldValue_ = value; }
private:
Modified: code/branches/cpp11_v2/src/libraries/network/synchronisable/SynchronisableVariable.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/synchronisable/SynchronisableVariable.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/network/synchronisable/SynchronisableVariable.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -73,11 +73,11 @@
SynchronisableVariable(T& variable, uint8_t syncDirection=VariableDirection::ToClient, NetworkCallbackBase *cb=nullptr);
virtual ~SynchronisableVariable();
- virtual inline uint8_t getMode(){ return mode_; }
- virtual inline uint32_t getData(uint8_t*& mem, uint8_t mode);
- virtual inline void putData(uint8_t*& mem, uint8_t mode, bool forceCallback = false);
- virtual inline uint32_t getSize(uint8_t mode);
- virtual inline void* getReference(){ return static_cast<void*>(const_cast<typename Loki::TypeTraits<T>::UnqualifiedType*>(&this->variable_)); }
+ virtual inline uint8_t getMode() override{ return mode_; }
+ virtual inline uint32_t getData(uint8_t*& mem, uint8_t mode) override;
+ virtual inline void putData(uint8_t*& mem, uint8_t mode, bool forceCallback = false) override;
+ virtual inline uint32_t getSize(uint8_t mode) override;
+ virtual inline void* getReference() override{ return static_cast<void*>(const_cast<typename Loki::TypeTraits<T>::UnqualifiedType*>(&this->variable_)); }
protected:
T& variable_;
uint8_t mode_;
Modified: code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -22,29 +22,29 @@
public:
BulletDebugDrawer(Ogre::SceneManager* sceneManager);
~BulletDebugDrawer();
- virtual void drawLine(const btVector3& from, const btVector3& to, const btVector3& color);
+ virtual void drawLine(const btVector3& from, const btVector3& to, const btVector3& color) override;
// virtual void drawTriangle(const btVector3& v0, const btVector3& v1, const btVector3& v2, const btVector3& color, btScalar);
- virtual void drawSphere (const btVector3& p, btScalar radius, const btVector3& color);
- virtual void drawSphere(btScalar radius, const btTransform& transform, const btVector3& color);
- virtual void drawBox(const btVector3& bbMin, const btVector3& bbMax, const btVector3& color);
- virtual void drawBox(const btVector3& bbMin, const btVector3& bbMax, const btTransform& trans, const btVector3& color);
- virtual void drawCylinder(btScalar radius, btScalar halfHeight, int upAxis, const btTransform& transform, const btVector3& color);
- virtual void drawCone(btScalar radius, btScalar height, int upAxis, const btTransform& transform, const btVector3& color);
+ virtual void drawSphere (const btVector3& p, btScalar radius, const btVector3& color) override;
+ virtual void drawSphere(btScalar radius, const btTransform& transform, const btVector3& color) override;
+ virtual void drawBox(const btVector3& bbMin, const btVector3& bbMax, const btVector3& color) override;
+ virtual void drawBox(const btVector3& bbMin, const btVector3& bbMax, const btTransform& trans, const btVector3& color) override;
+ virtual void drawCylinder(btScalar radius, btScalar halfHeight, int upAxis, const btTransform& transform, const btVector3& color) override;
+ virtual void drawCone(btScalar radius, btScalar height, int upAxis, const btTransform& transform, const btVector3& color) override;
// virtual void drawPlane(const btVector3& planeNormal, btScalar planeConst, const btTransform& transform, const btVector3& color);
- virtual void drawContactPoint(const btVector3& PointOnB, const btVector3& normalOnB, btScalar distance, int lifeTime, const btVector3& color);
+ virtual void drawContactPoint(const btVector3& PointOnB, const btVector3& normalOnB, btScalar distance, int lifeTime, const btVector3& color) override;
- virtual void reportErrorWarning(const char* warningString);
- virtual void draw3dText(const btVector3& location, const char* textString);
+ virtual void reportErrorWarning(const char* warningString) override;
+ virtual void draw3dText(const btVector3& location, const char* textString) override;
- virtual void setDebugMode(int debugMode);
- virtual int getDebugMode() const;
+ virtual void setDebugMode(int debugMode) override;
+ virtual int getDebugMode() const override;
void configure(bool bFill, float fillAlpha);
protected:
- bool frameStarted(const Ogre::FrameEvent& evt);
- bool frameEnded(const Ogre::FrameEvent& evt);
+ bool frameStarted(const Ogre::FrameEvent& evt) override;
+ bool frameEnded(const Ogre::FrameEvent& evt) override;
private:
struct ContactPoint
Modified: code/branches/cpp11_v2/src/libraries/tools/DynamicLines.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/DynamicLines.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/tools/DynamicLines.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -83,9 +83,9 @@
protected:
/// Implementation DynamicRenderable, creates a simple vertex-only decl
- virtual void createVertexDeclaration();
+ virtual void createVertexDeclaration() override;
/// Implementation DynamicRenderable, pushes point list out to hardware memory
- virtual void fillHardwareBuffers();
+ virtual void fillHardwareBuffers() override;
private:
std::vector<Vector3> mPoints;
Modified: code/branches/cpp11_v2/src/libraries/tools/DynamicRenderable.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/DynamicRenderable.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/tools/DynamicRenderable.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -60,9 +60,9 @@
bool useIndices);
/// Implementation of SimpleRenderable
- virtual Real getBoundingRadius(void) const;
+ virtual Real getBoundingRadius(void) const override;
/// Implementation of SimpleRenderable
- virtual Real getSquaredViewDepth(const Camera* cam) const;
+ virtual Real getSquaredViewDepth(const Camera* cam) const override;
protected:
/// Maximum capacity of the currently allocated vertex buffer.
Modified: code/branches/cpp11_v2/src/libraries/tools/ParticleInterface.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/ParticleInterface.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/tools/ParticleInterface.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -75,7 +75,7 @@
void setDetailLevel(unsigned int level);
protected:
- virtual void changedTimeFactor(float factor_new, float factor_old);
+ virtual void changedTimeFactor(float factor_new, float factor_old) override;
private:
void updateVisibility();
Modified: code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -43,7 +43,7 @@
ResourceCollection(Context* context);
virtual ~ResourceCollection();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void setResourceGroup(const std::string& resourceGroup);
const std::string& getResourceGroup() const { return resourceGroup_; }
Modified: code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -45,7 +45,7 @@
ResourceLocation(Context* context);
virtual ~ResourceLocation();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void setPath(const std::string& path) { path_ = path; }
const std::string& getPath() const { return path_; }
Modified: code/branches/cpp11_v2/src/libraries/tools/Shader.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/Shader.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/tools/Shader.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -86,12 +86,12 @@
inline Ogre::SceneManager* getSceneManager() const
{ return this->scenemanager_; }
- virtual void cameraChanged(Ogre::Viewport* viewport, Ogre::Camera* oldCamera);
+ virtual void cameraChanged(Ogre::Viewport* viewport, Ogre::Camera* oldCamera) override;
void setParameter(unsigned short technique, unsigned short pass, const std::string& parameter, float value);
void setParameter(unsigned short technique, unsigned short pass, const std::string& parameter, int value);
- virtual void notifyMaterialRender(Ogre::uint32 pass_id, Ogre::MaterialPtr& materialPtr);
+ virtual void notifyMaterialRender(Ogre::uint32 pass_id, Ogre::MaterialPtr& materialPtr) override;
private:
static bool hasCgProgramManager();
Modified: code/branches/cpp11_v2/src/libraries/tools/Timer.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/Timer.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/tools/Timer.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -174,7 +174,7 @@
RealTimer(float interval, bool bLoop, const ExecutorPtr& executor, bool bKillAfterCall = false);
protected:
- virtual float getTimeFactor();
+ virtual float getTimeFactor() override;
};
}
Modified: code/branches/cpp11_v2/src/libraries/util/ExprParser.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/ExprParser.cc 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/util/ExprParser.cc 2015-11-19 10:40:28 UTC (rev 10817)
@@ -401,7 +401,7 @@
if (counter > 255)
{
this->failed_ = true;
- return '\0';
+ return str;
}
};
*word = '\0';
Modified: code/branches/cpp11_v2/src/libraries/util/MultiType.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/MultiType.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/util/MultiType.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -427,7 +427,7 @@
this->createNewValueContainer(value);
}
/// Creates a new value container (works only with specialized types).
- template <typename T> inline void createNewValueContainer(const T& value) { /* STATIC ASSERT */ *****value; return false; }
+ template <typename T> inline void createNewValueContainer(const T& value) { /* STATIC ASSERT */ *****value; }
MT_ValueBase* value_; //!< A pointer to the value container
};
Modified: code/branches/cpp11_v2/src/libraries/util/MultiTypeValue.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/MultiTypeValue.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/util/MultiTypeValue.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -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 { return new MT_Value<T>(this->value_, this->type_); }
+ 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() { this->value_ = zeroise<T>(); bLastConversionSuccessful = true; }
+ inline void reset() override { this->value_ = zeroise<T>(); bLastConversionSuccessful = true; }
- inline bool getValue(char* value) const { 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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.
+ 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.
/**
@brief Assigns the value of the other MultiType, converted to T.
@param other The other MultiType
*/
- inline bool setValue(const MultiType& other)
+ inline bool setValue(const MultiType& other) override
{
if (other.value_)
{
@@ -103,39 +103,39 @@
}
}
- inline bool setValue(const char& value) { return (bLastConversionSuccessful = convertValue<char , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const unsigned char& value) { return (bLastConversionSuccessful = convertValue<unsigned char , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const short& value) { return (bLastConversionSuccessful = convertValue<short , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const unsigned short& value) { return (bLastConversionSuccessful = convertValue<unsigned short , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const int& value) { return (bLastConversionSuccessful = convertValue<int , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const unsigned int& value) { return (bLastConversionSuccessful = convertValue<unsigned int , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const long& value) { return (bLastConversionSuccessful = convertValue<long , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const unsigned long& value) { 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) { 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) { 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) { return (bLastConversionSuccessful = convertValue<float , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const double& value) { return (bLastConversionSuccessful = convertValue<double , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const long double& value) { return (bLastConversionSuccessful = convertValue<long double , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const bool& value) { return (bLastConversionSuccessful = convertValue<bool , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue( void* const& value) { return (bLastConversionSuccessful = convertValue<void* , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
- inline bool setValue(const std::string& value) { 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) { 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) { 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) { 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) { 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) { 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) { 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) { return (bLastConversionSuccessful = convertValue<orxonox::Degree , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
+ 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.
/// Puts the current value on the stream
- inline void toString(std::ostream& outstream) const { outstream << this->value_; }
+ 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 ) { loadAndIncrease( /*(const T&)*/this->value_, mem ); }
+ 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 { saveAndIncrease( /*(const T&)*/this->value_, mem ); }
+ 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 { return returnSize( this->value_ ); }
+ inline uint8_t getSize() const override { return returnSize( this->value_ ); }
T value_; ///< The stored value
};
Modified: code/branches/cpp11_v2/src/libraries/util/SharedPtr.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/SharedPtr.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/util/SharedPtr.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -175,7 +175,7 @@
public:
SharedCounterImpl(T* pointer) : pointer_(pointer) {}
- void destroy()
+ void destroy() override
{
delete this->pointer_;
}
Modified: code/branches/cpp11_v2/src/libraries/util/output/BaseWriter.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/output/BaseWriter.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/util/output/BaseWriter.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -102,7 +102,7 @@
{ return "Output"; }
protected:
- virtual void output(OutputLevel level, const OutputContextContainer& context, const std::vector<std::string>& lines);
+ virtual void output(OutputLevel level, const OutputContextContainer& context, const std::vector<std::string>& lines) override;
private:
virtual void printLine(const std::string& line, OutputLevel level) = 0; ///< Pure virtual function, gets called for each line of output together with a prefix which describes level and context of the output.
Modified: code/branches/cpp11_v2/src/libraries/util/output/ConsoleWriter.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/output/ConsoleWriter.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/util/output/ConsoleWriter.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -62,7 +62,7 @@
{ return this->outputStream_; }
protected:
- virtual void printLine(const std::string& line, OutputLevel level);
+ virtual void printLine(const std::string& line, OutputLevel level) override;
private:
std::ostream& outputStream_; ///< The ostream to which the console writer writes its output
Modified: code/branches/cpp11_v2/src/libraries/util/output/LogWriter.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/output/LogWriter.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/util/output/LogWriter.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -69,7 +69,7 @@
{ return this->file_; }
protected:
- virtual void printLine(const std::string& line, OutputLevel level);
+ virtual void printLine(const std::string& line, OutputLevel level) override;
private:
void openFile();
Modified: code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -74,7 +74,7 @@
void disable();
protected:
- virtual void output(OutputLevel level, const OutputContextContainer& context, const std::vector<std::string>& lines);
+ virtual void output(OutputLevel level, const OutputContextContainer& context, const std::vector<std::string>& lines) override;
private:
std::vector<Message> messages_; ///< Stores all output messages from the creation of this instance until disable() is called.
Modified: code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -80,11 +80,11 @@
virtual void registerListener(OutputListener* listener);
virtual void unregisterListener(OutputListener* listener);
- virtual void updatedLevelMask(const OutputListener* listener)
+ virtual void updatedLevelMask(const OutputListener* listener) override
{ this->updateCombinedLevelMask(); }
- virtual void updatedAdditionalContextsLevelMask(const OutputListener* listener)
+ virtual void updatedAdditionalContextsLevelMask(const OutputListener* listener) override
{ this->updateCombinedAdditionalContextsLevelMask(); }
- virtual void updatedAdditionalContextsMask(const OutputListener* listener)
+ virtual void updatedAdditionalContextsMask(const OutputListener* listener) override
{ this->updateCombinedAdditionalContextsMask(); }
/**
Modified: code/branches/cpp11_v2/src/libraries/util/output/SubcontextOutputListener.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/output/SubcontextOutputListener.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/libraries/util/output/SubcontextOutputListener.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -72,10 +72,10 @@
SubcontextOutputListener(bool bRegister = true);
virtual ~SubcontextOutputListener();
- virtual void setAdditionalContextsMask(OutputContextMask mask);
+ virtual void setAdditionalContextsMask(OutputContextMask mask) override;
void setAdditionalSubcontexts(const std::set<const OutputContextContainer*>& subcontexts);
- virtual bool acceptsOutput(OutputLevel level, const OutputContextContainer& context) const;
+ virtual bool acceptsOutput(OutputLevel level, const OutputContextContainer& context) const override;
inline const std::set<OutputContextSubID>& getSubcontexts() const
{ return this->subcontexts_; }
Modified: code/branches/cpp11_v2/src/modules/designtools/CreateStars.h
===================================================================
--- code/branches/cpp11_v2/src/modules/designtools/CreateStars.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/designtools/CreateStars.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -42,7 +42,7 @@
void createBillboards();
- void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/designtools/SkyboxGenerator.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -64,7 +64,7 @@
public:
SkyboxGenerator();
virtual ~SkyboxGenerator();
- void tick(float dt); // This is where the skybox generation happens.
+ 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/docking/Dock.h
===================================================================
--- code/branches/cpp11_v2/src/modules/docking/Dock.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/docking/Dock.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -64,8 +64,8 @@
bool undocking(bool bTriggered, BaseObject* trigger);
// XML interface
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
// XML functions
bool addEffect(DockingEffect* effect); //!< Add a DockingEffect to the Dock.
Modified: code/branches/cpp11_v2/src/modules/docking/DockToShip.h
===================================================================
--- code/branches/cpp11_v2/src/modules/docking/DockToShip.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/docking/DockToShip.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -59,12 +59,12 @@
DockToShip(Context* context);
virtual ~DockToShip();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void setTargetId(const std::string& str);
const std::string& getTargetId() const;
- virtual bool docking(PlayerInfo* player); //!< Called when docking starts
- virtual bool release(PlayerInfo* player); //!< Called when player wants undock
+ virtual bool docking(PlayerInfo* player) override; //!< Called when docking starts
+ virtual bool release(PlayerInfo* player) override; //!< Called when player wants undock
private:
std::string target_;
};
Modified: code/branches/cpp11_v2/src/modules/docking/DockingController.h
===================================================================
--- code/branches/cpp11_v2/src/modules/docking/DockingController.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/docking/DockingController.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -44,7 +44,7 @@
DockingController(Context* context);
virtual ~DockingController();
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
void takeControl(bool docking);
@@ -52,7 +52,7 @@
void setPlayer(PlayerInfo* player) { this->player_ = player; }
protected:
- virtual void positionReached();
+ virtual void positionReached() override;
private:
bool docking_;
Modified: code/branches/cpp11_v2/src/modules/docking/DockingTarget.h
===================================================================
--- code/branches/cpp11_v2/src/modules/docking/DockingTarget.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/docking/DockingTarget.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -57,7 +57,7 @@
DockingTarget(Context* context);
virtual ~DockingTarget();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
};
Modified: code/branches/cpp11_v2/src/modules/docking/MoveToDockingTarget.h
===================================================================
--- code/branches/cpp11_v2/src/modules/docking/MoveToDockingTarget.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/docking/MoveToDockingTarget.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -58,8 +58,8 @@
MoveToDockingTarget(Context* context);
virtual ~MoveToDockingTarget();
- virtual bool docking(PlayerInfo* player); //!< Called when a player starts docking
- virtual bool release(PlayerInfo* player); //!< Called when player wants to undock
+ virtual bool docking(PlayerInfo* player) override; //!< Called when a player starts docking
+ virtual bool release(PlayerInfo* player) override; //!< Called when player wants to undock
};
}
Modified: code/branches/cpp11_v2/src/modules/dodgerace/DodgeRace.h
===================================================================
--- code/branches/cpp11_v2/src/modules/dodgerace/DodgeRace.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/dodgerace/DodgeRace.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -68,12 +68,12 @@
public:
DodgeRace(Context* context);
- virtual void start();
- virtual void end();
+ virtual void start() override;
+ virtual void end() override;
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
- virtual void playerPreSpawn(PlayerInfo* player);
+ virtual void playerPreSpawn(PlayerInfo* player) override;
void levelUp();
@@ -84,7 +84,7 @@
void setCenterpoint(DodgeRaceCenterPoint* center)
{ this->center_ = center; }
- virtual void addBots(unsigned int amount){} //<! overwrite function in order to bypass the addbots command
+ virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command
// checks if multiplier should be reset.
void comboControll();
Modified: code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceCenterPoint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceCenterPoint.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceCenterPoint.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -49,7 +49,7 @@
public:
DodgeRaceCenterPoint(Context* context); //checks whether the gametype is actually DodgeRace.
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
private:
void checkGametype();
Modified: code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceHUDinfo.h
===================================================================
--- code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceHUDinfo.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceHUDinfo.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -43,9 +43,9 @@
public:
DodgeRaceHUDinfo(Context* context);
- virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void changedOwner();
+ virtual void tick(float dt) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void changedOwner() override;
inline void setShowPoints(bool value)
{ this->bShowPoints_ = value; }
Modified: code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.h
===================================================================
--- code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -51,21 +51,21 @@
public:
DodgeRaceShip(Context* context);
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
// overwrite for 2d movement
- virtual void moveFrontBack(const Vector2& value);
- virtual void moveRightLeft(const Vector2& value);
+ virtual void moveFrontBack(const Vector2& value) override;
+ virtual void moveRightLeft(const Vector2& value) override;
// Starts or stops fireing
- virtual void boost(bool bBoost);
+ virtual void boost(bool bBoost) override;
//no rotation!
- virtual void rotateYaw(const Vector2& value){};
- virtual void rotatePitch(const Vector2& value){};
+ virtual void rotateYaw(const Vector2& value) override{};
+ virtual void rotatePitch(const Vector2& value) override{};
//return to main menu if game has ended.
- virtual void rotateRoll(const Vector2& value){if (getGame()) if (getGame()->bEndGame) getGame()->end();};
+ virtual void rotateRoll(const Vector2& value) override{if (getGame()) if (getGame()->bEndGame) getGame()->end();};
virtual void updateLevel();
@@ -73,7 +73,7 @@
bool isFireing;
protected:
- virtual void death();
+ virtual void death() override;
private:
virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
Modified: code/branches/cpp11_v2/src/modules/gametypes/OldRaceCheckPoint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/gametypes/OldRaceCheckPoint.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/gametypes/OldRaceCheckPoint.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -47,11 +47,11 @@
OldRaceCheckPoint(Context* context);
virtual ~OldRaceCheckPoint();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void tick(float dt);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void tick(float dt) override;
protected:
- virtual void triggered(bool bIsTriggered);
+ virtual void triggered(bool bIsTriggered) override;
inline void setLast(bool isLast)
{ this->bIsLast_ = isLast; }
inline bool getLast()
@@ -63,7 +63,7 @@
virtual void setTimelimit(float timeLimit);
inline float getTimeLimit()
{ return this->bTimeLimit_;}
- inline const WorldEntity* getWorldEntity() const
+ inline const WorldEntity* getWorldEntity() const override
{ return this; }
private:
Modified: code/branches/cpp11_v2/src/modules/gametypes/OldSpaceRace.h
===================================================================
--- code/branches/cpp11_v2/src/modules/gametypes/OldSpaceRace.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/gametypes/OldSpaceRace.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -54,11 +54,11 @@
OldSpaceRace(Context* context);
virtual ~OldSpaceRace() {}
- virtual void start();
- virtual void end();
+ virtual void start() override;
+ virtual void end() override;
virtual void newCheckpointReached();
- virtual void addBots(unsigned int amount){} //<! overwrite function in order to bypass the addbots command.
+ virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command.
//<! This is only a temporary solution. Better: create racingBots.
inline void setCheckpointsReached(int n)
Modified: code/branches/cpp11_v2/src/modules/gametypes/RaceCheckPoint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/gametypes/RaceCheckPoint.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/gametypes/RaceCheckPoint.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -47,7 +47,7 @@
RaceCheckPoint(Context* context);
virtual ~RaceCheckPoint();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
inline void setCheckpointIndex(int checkpointIndex)
{
@@ -91,9 +91,9 @@
protected:
- virtual void fire(bool bIsTriggered, BaseObject* originator);
+ virtual void fire(bool bIsTriggered, BaseObject* originator) override;
- inline const WorldEntity* getWorldEntity() const
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/gametypes/SpaceRace.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -56,9 +56,9 @@
SpaceRace(Context* context);
virtual ~SpaceRace() {}
- void tick(float dt);
+ void tick(float dt) override;
- virtual void end();
+ virtual void end() override;
void newCheckpointReached(RaceCheckPoint* checkpoint, PlayerInfo* player);
inline RaceCheckPoint* getCheckpointReached(PlayerInfo* player)
@@ -69,9 +69,9 @@
inline Clock& getClock()
{ return this->clock_; }
- bool allowPawnHit(Pawn* victim, Pawn* originator);
- bool allowPawnDamage(Pawn* victim, Pawn* originator);
- bool allowPawnDeath(Pawn* victim, Pawn* originator);
+ bool allowPawnHit(Pawn* victim, Pawn* originator) override;
+ bool allowPawnDamage(Pawn* victim, Pawn* originator) override;
+ 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/SpaceRaceController.h
===================================================================
--- code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceController.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceController.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -41,8 +41,8 @@
public:
SpaceRaceController(Context* context);
virtual ~SpaceRaceController();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void tick(float dt);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void tick(float dt) override;
private:
float recCalculateDistance(RaceCheckPoint*, const Vector3& currentPosition);
Modified: code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.h
===================================================================
--- code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -57,7 +57,7 @@
SpaceRaceManager(Context* context);
virtual ~SpaceRaceManager() ;
- void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ 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);
+ void tick(float dt) override;
protected:
bool reachedValidCheckpoint(RaceCheckPoint* oldCheckpoint, RaceCheckPoint* newCheckpoint, PlayerInfo* player) const;
Modified: code/branches/cpp11_v2/src/modules/invader/Invader.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/Invader.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/invader/Invader.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -48,9 +48,9 @@
public:
Invader(Context* context);
- virtual void start();
- virtual void end();
- virtual void addBots(unsigned int amount){} //<! overwrite function in order to bypass the addbots command
+ virtual void start() override;
+ virtual void end() override;
+ virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command
void spawnEnemy();
Modified: code/branches/cpp11_v2/src/modules/invader/InvaderCenterPoint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderCenterPoint.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderCenterPoint.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -46,7 +46,7 @@
public:
InvaderCenterPoint(Context* context); //checks whether the gametype is actually Invader.
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
private:
void checkGametype();
Modified: code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -45,9 +45,9 @@
public:
InvaderEnemy(Context* context);
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
- virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs);
+ virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) override;
virtual void setPlayer(InvaderShip* player){this->player = player;}
int level;
Modified: code/branches/cpp11_v2/src/modules/invader/InvaderEnemyShooter.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderEnemyShooter.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderEnemyShooter.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -46,8 +46,8 @@
public:
InvaderEnemyShooter(Context* context);
- virtual void tick(float dt);
- virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs);
+ virtual void tick(float dt) override;
+ virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) override;
protected:
void shoot();
Timer shootTimer;
Modified: code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -39,9 +39,9 @@
public:
InvaderHUDinfo(Context* context);
- virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void changedOwner();
+ virtual void tick(float dt) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void changedOwner() override;
inline void setShowLives(bool value)
{ this->bShowLives_ = value; }
Modified: code/branches/cpp11_v2/src/modules/invader/InvaderShip.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderShip.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderShip.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -46,27 +46,27 @@
public:
InvaderShip(Context* context);
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
// overwrite for 2d movement
- virtual void moveFrontBack(const Vector2& value);
- virtual void moveRightLeft(const Vector2& value);
+ virtual void moveFrontBack(const Vector2& value) override;
+ virtual void moveRightLeft(const Vector2& value) override;
// Starts or stops fireing
- virtual void boost(bool bBoost);
+ virtual void boost(bool bBoost) override;
//no rotation!
- virtual void rotateYaw(const Vector2& value){};
- virtual void rotatePitch(const Vector2& value){};
+ virtual void rotateYaw(const Vector2& value) override{};
+ virtual void rotatePitch(const Vector2& value) override{};
//return to main menu if game has ended.
- virtual void rotateRoll(const Vector2& value);
+ virtual void rotateRoll(const Vector2& value) override;
virtual void updateLevel();
virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
protected:
- virtual void death();
+ virtual void death() override;
private:
Invader* getGame();
WeakPtr<Invader> game;
Modified: code/branches/cpp11_v2/src/modules/invader/InvaderWeapon.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderWeapon.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderWeapon.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -47,7 +47,7 @@
InvaderWeapon(Context* context);
virtual ~InvaderWeapon();
protected:
- virtual void shot();
+ virtual void shot() override;
WeakPtr<Projectile> projectile;
};
}
Modified: code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -46,7 +46,7 @@
public:
InvaderWeaponEnemy(Context* context);
protected:
- virtual void shot();
+ virtual void shot() override;
};
}
Modified: code/branches/cpp11_v2/src/modules/jump/Jump.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/Jump.cc 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/jump/Jump.cc 2015-11-19 10:40:28 UTC (rev 10817)
@@ -97,7 +97,7 @@
// Create new platforms if needed
if (screenShiftSinceLastUpdate_ > center_->getSectionLength())
{
- if (sectionNumber_ > 2 && sectionNumber_%4 == 0 && rand()%2 == 0 && figure_->propellerActive_ == false && figure_->rocketActive_ == false && addAdventure(adventureNumber_) == true)
+ if (sectionNumber_ > 2 && sectionNumber_%4 == 0 && rand()%2 == 0 && figure_->propellerActive_ == nullptr && figure_->rocketActive_ == nullptr && addAdventure(adventureNumber_) == true)
{
screenShiftSinceLastUpdate_ -= 2*center_->getSectionLength();
++ adventureNumber_;
Modified: code/branches/cpp11_v2/src/modules/jump/Jump.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/Jump.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/jump/Jump.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -39,10 +39,10 @@
public:
Jump(Context* context);
virtual ~Jump();
- virtual void tick(float dt);
- virtual void start();
- virtual void end();
- virtual void spawnPlayer(PlayerInfo* player);
+ virtual void tick(float dt) override;
+ virtual void start() override;
+ virtual void end() override;
+ virtual void spawnPlayer(PlayerInfo* player) override;
int getScore(PlayerInfo* player) const;
float getFuel() const;
bool getDead(PlayerInfo* player) const;
Modified: code/branches/cpp11_v2/src/modules/jump/JumpBoots.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpBoots.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/jump/JumpBoots.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -39,9 +39,9 @@
public:
JumpBoots(Context* context);
virtual ~JumpBoots();
- virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void touchFigure();
+ virtual void tick(float dt) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void touchFigure() override;
virtual float getFuelState();
protected:
float stretch_;
Modified: code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -107,7 +107,7 @@
public:
JumpCenterpoint(Context* context); //!< Constructor. Registers and initializes the object and checks whether the gametype is actually Jump.
virtual ~JumpCenterpoint() {}
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method to create a JumpCenterpoint through XML.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method to create a JumpCenterpoint through XML.
void setPlatformStaticTemplate(const std::string& balltemplate)
{ this->platformStaticTemplate_ = balltemplate; }
const std::string& getPlatformStaticTemplate() const
Modified: code/branches/cpp11_v2/src/modules/jump/JumpEnemy.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpEnemy.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/jump/JumpEnemy.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -45,8 +45,8 @@
public:
JumpEnemy(Context* context);
virtual ~JumpEnemy();
- virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void tick(float dt) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void setFieldDimension(float width, float height)
{ this->fieldWidth_ = width; this->fieldHeight_ = height; }
void setFieldDimension(const Vector2& dimension)
Modified: code/branches/cpp11_v2/src/modules/jump/JumpFigure.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpFigure.cc 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/jump/JumpFigure.cc 2015-11-19 10:40:28 UTC (rev 10817)
@@ -318,7 +318,7 @@
bool JumpFigure::StartShield(JumpShield* shield)
{
- if (shieldActive_ == false)
+ if (shieldActive_ == nullptr)
{
attach(shield);
shield->setPosition(0.0, 0.0, propellerPos_);
Modified: code/branches/cpp11_v2/src/modules/jump/JumpFigure.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpFigure.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/jump/JumpFigure.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -39,15 +39,15 @@
public:
JumpFigure(Context* context); //!< Constructor. Registers and initializes the object.
virtual ~JumpFigure() {}
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void tick(float dt);
- virtual void moveFrontBack(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
- virtual void moveRightLeft(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
- virtual void rotateYaw(const Vector2& value);
- virtual void rotatePitch(const Vector2& value);
- virtual void rotateRoll(const Vector2& value);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void tick(float dt) override;
+ virtual void moveFrontBack(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
+ virtual void moveRightLeft(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
+ virtual void rotateYaw(const Vector2& value) override;
+ virtual void rotatePitch(const Vector2& value) override;
+ virtual void rotateRoll(const Vector2& value) override;
void fire(unsigned int firemode);
- virtual void fired(unsigned int firemode);
+ virtual void fired(unsigned int firemode) override;
virtual void JumpFromPlatform(JumpPlatform* platform);
virtual void JumpFromSpring(JumpSpring* spring);
virtual void CollisionWithEnemy(JumpEnemy* enemy);
Modified: code/branches/cpp11_v2/src/modules/jump/JumpItem.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpItem.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/jump/JumpItem.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -46,8 +46,8 @@
public:
JumpItem(Context* context);
virtual ~JumpItem();
- virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void tick(float dt) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
virtual void setProperties(float newLeftBoundary, float newRightBoundary, float newLowerBoundary, float newUpperBoundary, float newHSpeed, float newVSpeed);
virtual void setFigure(JumpFigure* newFigure);
virtual void touchFigure();
Modified: code/branches/cpp11_v2/src/modules/jump/JumpPlatform.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatform.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatform.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -45,8 +45,8 @@
public:
JumpPlatform(Context* context);
virtual ~JumpPlatform();
- virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void tick(float dt) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void setFigure(JumpFigure* newFigure);
virtual void touchFigure();
Modified: code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -45,11 +45,11 @@
public:
JumpPlatformDisappear(Context* context);
virtual ~JumpPlatformDisappear();
- virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void tick(float dt) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
virtual void setProperties(bool active);
virtual bool isActive();
- virtual void touchFigure();
+ virtual void touchFigure() override;
protected:
bool active_;
Modified: code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -45,8 +45,8 @@
public:
JumpPlatformFake(Context* context);
virtual ~JumpPlatformFake();
- virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void tick(float dt) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
};
}
Modified: code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -40,10 +40,10 @@
public:
JumpPlatformHMove(Context* context);
virtual ~JumpPlatformHMove();
- virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void tick(float dt) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
virtual void setProperties(float leftBoundary, float rightBoundary, float speed);
- virtual void touchFigure();
+ virtual void touchFigure() override;
protected:
float leftBoundary_;
Modified: code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -40,10 +40,10 @@
JumpPlatformStatic(Context* context);
virtual ~JumpPlatformStatic();
- virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void tick(float dt) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
- virtual void touchFigure();
+ virtual void touchFigure() override;
};
}
Modified: code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -45,11 +45,11 @@
public:
JumpPlatformTimer(Context* context);
virtual ~JumpPlatformTimer();
- virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void tick(float dt) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
virtual void setProperties(float time);
virtual bool isActive(void);
- virtual void touchFigure();
+ virtual void touchFigure() override;
void setEffectPath(const std::string& effectPath)
{ this->effectPath_ = effectPath; }
Modified: code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -39,10 +39,10 @@
public:
JumpPlatformVMove(Context* context);
virtual ~JumpPlatformVMove();
- virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void tick(float dt) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
virtual void setProperties(float leftBoundary, float rightBoundary, float speed);
- virtual void touchFigure();
+ virtual void touchFigure() override;
protected:
float lowerBoundary_;
Modified: code/branches/cpp11_v2/src/modules/jump/JumpProjectile.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpProjectile.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/jump/JumpProjectile.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -42,9 +42,9 @@
JumpProjectile(Context* context);
virtual ~JumpProjectile();
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void setFieldDimension(float width, float height)
{ this->fieldWidth_ = width; this->fieldHeight_ = height; }
Modified: code/branches/cpp11_v2/src/modules/jump/JumpPropeller.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPropeller.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPropeller.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -39,9 +39,9 @@
public:
JumpPropeller(Context* context);
virtual ~JumpPropeller();
- virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void touchFigure();
+ virtual void tick(float dt) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void touchFigure() override;
virtual float getFuelState();
protected:
float stretch_;
Modified: code/branches/cpp11_v2/src/modules/jump/JumpRocket.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpRocket.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/jump/JumpRocket.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -39,9 +39,9 @@
public:
JumpRocket(Context* context);
virtual ~JumpRocket();
- virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void touchFigure();
+ virtual void tick(float dt) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void touchFigure() override;
virtual float getFuelState();
protected:
float stretch_;
Modified: code/branches/cpp11_v2/src/modules/jump/JumpScore.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpScore.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/jump/JumpScore.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -43,9 +43,9 @@
JumpScore(Context* context);
virtual ~JumpScore();
- virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void changedOwner();
+ virtual void tick(float dt) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void changedOwner() override;
void setShowScore(const bool showScore)
{ showScore_ = showScore; }
Modified: code/branches/cpp11_v2/src/modules/jump/JumpShield.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpShield.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/jump/JumpShield.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -39,9 +39,9 @@
public:
JumpShield(Context* context);
virtual ~JumpShield();
- virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void touchFigure();
+ virtual void tick(float dt) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void touchFigure() override;
virtual float getFuelState();
protected:
float stretch_;
Modified: code/branches/cpp11_v2/src/modules/jump/JumpSpring.h
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpSpring.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/jump/JumpSpring.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -39,10 +39,10 @@
public:
JumpSpring(Context* context);
virtual ~JumpSpring();
- virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void tick(float dt) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
virtual void accelerateFigure();
- virtual void touchFigure();
+ virtual void touchFigure() override;
protected:
float stretch_;
};
Modified: code/branches/cpp11_v2/src/modules/mini4dgame/Mini4Dgame.h
===================================================================
--- code/branches/cpp11_v2/src/modules/mini4dgame/Mini4Dgame.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/mini4dgame/Mini4Dgame.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -64,10 +64,10 @@
Mini4Dgame(Context* context); //!< Constructor. Registers and initializes the object.
virtual ~Mini4Dgame(); //!< Destructor. Cleans up, if initialized.
- virtual void start(void); //!< Starts the Mini4Dgame minigame.
- virtual void end(void); ///!< Ends the Mini4Dgame minigame.
+ virtual void start(void) override; //!< Starts the Mini4Dgame minigame.
+ virtual void end(void) override; ///!< Ends the Mini4Dgame minigame.
- virtual void spawnPlayer(PlayerInfo* player); //!< Spawns the input player.
+ virtual void spawnPlayer(PlayerInfo* player) override; //!< Spawns the input player.
void setGameboard(Mini4DgameBoard* board)
{ this->board_ = board; }
@@ -83,7 +83,7 @@
void win(Mini4DgameWinner winner);
protected:
- virtual void spawnPlayersIfRequested(); //!< Spawns player.
+ virtual void spawnPlayersIfRequested() override; //!< Spawns player.
private:
Modified: code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameBoard.h
===================================================================
--- code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameBoard.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameBoard.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -73,7 +73,7 @@
Mini4DgameBoard(Context* context);
//virtual ~Mini4DgameBoard();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
bool isValidMove(const Mini4DgamePosition& move);
void undoMove();
Modified: code/branches/cpp11_v2/src/modules/notifications/NotificationDispatcher.h
===================================================================
--- code/branches/cpp11_v2/src/modules/notifications/NotificationDispatcher.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/notifications/NotificationDispatcher.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -78,8 +78,8 @@
NotificationDispatcher(Context* context); //!< Default constructor. Initializes the object.
virtual ~NotificationDispatcher(); //!< Destructor.
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a NotificationDispatcher object through XML.
- virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a NotificationDispatcher object through XML.
+ virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
/**
@brief Get the sender of the Notification dispatched by this NotificationDispatcher.
Modified: code/branches/cpp11_v2/src/modules/notifications/NotificationManager.h
===================================================================
--- code/branches/cpp11_v2/src/modules/notifications/NotificationManager.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/notifications/NotificationManager.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -119,7 +119,7 @@
NotificationManager();
virtual ~NotificationManager();
- virtual void preDestroy(void); // Is called before the object is destroyed.
+ virtual void preDestroy(void) override; // Is called before the object is destroyed.
/**
@brief Get the instance of the NotificationManager Singleton.
@@ -127,8 +127,8 @@
*/
static NotificationManager& getInstance() { return Singleton<NotificationManager>::getInstance(); } // tolua_export
- virtual bool registerNotification(const std::string& message, const std::string& sender, notificationMessageType::Value type);
- virtual bool executeCommand(notificationCommand::Value command, const std::string& sender);
+ virtual bool registerNotification(const std::string& message, const std::string& sender, notificationMessageType::Value type) override;
+ virtual bool executeCommand(notificationCommand::Value command, const std::string& sender) override;
bool registerNotification(Notification* notification); // Registers a Notification within the NotificationManager.
void unregisterNotification(Notification* notification, NotificationQueue* queue); // Unregisters a Notification within the NotificationManager for a given NotificationQueue.
Modified: code/branches/cpp11_v2/src/modules/notifications/NotificationQueue.h
===================================================================
--- code/branches/cpp11_v2/src/modules/notifications/NotificationQueue.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/notifications/NotificationQueue.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -96,10 +96,10 @@
NotificationQueue(Context* context);
virtual ~NotificationQueue();
- virtual void tick(float dt); // To update from time to time.
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void tick(float dt) override; // To update from time to time.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
- virtual void changedName(void);
+ virtual void changedName(void) override;
void update(void); // Updates the NotificationQueue.
void update(Notification* notification, const std::time_t & time); // Updates the NotificationQueue by adding an new Notification.
Modified: code/branches/cpp11_v2/src/modules/notifications/NotificationQueueCEGUI.h
===================================================================
--- code/branches/cpp11_v2/src/modules/notifications/NotificationQueueCEGUI.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/notifications/NotificationQueueCEGUI.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -72,9 +72,9 @@
NotificationQueueCEGUI(Context* context);
virtual ~NotificationQueueCEGUI();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
- virtual void changedName(void);
+ virtual void changedName(void) override;
void destroy(bool noGraphics = false); // Destroys the NotificationQueue.
@@ -135,13 +135,13 @@
protected:
void registerVariables();
- virtual void create(void); // Creates the NotificationQueue in lua.
+ virtual void create(void) override; // Creates the NotificationQueue in lua.
- virtual void notificationPushed(Notification* notification); // Is called by the NotificationQueue when a Notification was pushed
- virtual void notificationPopped(void); // Is called by the NotificationQueue when a Notification was popped.
- virtual void notificationRemoved(unsigned int index); // Is called when a Notification was removed.
+ virtual void notificationPushed(Notification* notification) override; // Is called by the NotificationQueue when a Notification was pushed
+ virtual void notificationPopped(void) override; // Is called by the NotificationQueue when a Notification was popped.
+ virtual void notificationRemoved(unsigned int index) override; // Is called when a Notification was removed.
- virtual void clear(bool noGraphics = false); // Clears the NotificationQueue by removing all NotificationContainers.
+ virtual void clear(bool noGraphics = false) override; // Clears the NotificationQueue by removing all NotificationContainers.
protected:
static const std::string NOTIFICATION_LAYER; //!< The name of the NotificationLayer menu sheet.
Modified: code/branches/cpp11_v2/src/modules/objects/Attacher.h
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/Attacher.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/objects/Attacher.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -50,11 +50,11 @@
Attacher(Context* context);
virtual ~Attacher() {}
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
- virtual void processEvent(Event& event);
- virtual void changedActivity();
- virtual void changedVisibility();
+ virtual void processEvent(Event& event) override;
+ virtual void changedActivity() override;
+ virtual void changedVisibility() override;
void addObject(WorldEntity* object);
WorldEntity* getObject(unsigned int index) const;
@@ -63,7 +63,7 @@
inline const std::string& getTarget() const
{ return this->targetname_; }
- void loadedNewXMLName(BaseObject* object);
+ void loadedNewXMLName(BaseObject* object) override;
private:
WorldEntity* target_;
Modified: code/branches/cpp11_v2/src/modules/objects/ForceField.h
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/ForceField.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/objects/ForceField.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -91,9 +91,9 @@
ForceField(Context* context);
virtual ~ForceField();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Creates a ForceField object through XML.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Creates a ForceField object through XML.
void registerVariables(); //!< Registers the variables that should get synchronised over the network
- virtual void tick(float dt); //!< A method that is called every tick.
+ virtual void tick(float dt) override; //!< A method that is called every tick.
/**
Modified: code/branches/cpp11_v2/src/modules/objects/Planet.h
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/Planet.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/objects/Planet.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -51,11 +51,11 @@
virtual ~Planet();
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
- virtual void changedVisibility();
+ virtual void changedVisibility() override;
inline void setMeshSource(const std::string& meshname)
{ this->meshSrc_ = meshname; this->changedMesh(); }
Modified: code/branches/cpp11_v2/src/modules/objects/Script.h
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/Script.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/objects/Script.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -97,8 +97,8 @@
Script(Context* context);
virtual ~Script();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a Script object through XML.
- virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode); //!< Creates a port that can be used to channel events and react to them.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a Script object through XML.
+ virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Creates a port that can be used to channel events and react to them.
bool trigger(bool triggered, BaseObject* trigger); //!< Is called when an event comes in trough the event port.
void execute(unsigned int clientId, bool onLoad = false); //!< Executes the Scripts code for the input client, depending on the mode.
@@ -167,8 +167,8 @@
bool isForAll(void)
{ return this->forAll_; }
- virtual void clientConnected(unsigned int clientId); //!< Callback that is called when a new client has connected.
- virtual void clientDisconnected(unsigned int clientid) {}
+ virtual void clientConnected(unsigned int clientId) override; //!< Callback that is called when a new client has connected.
+ virtual void clientDisconnected(unsigned int clientid) override {}
private:
//! Static variables to avoid magic strings.
Modified: code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.h
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -92,9 +92,9 @@
void setReaction(int mode);
int getReaction();
- void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
- void tick(float dt);
+ void tick(float dt) override;
private:
struct BillboardAdministration{ bool usedYet; Billboard* billy; };
Modified: code/branches/cpp11_v2/src/modules/objects/Turret.h
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/Turret.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/objects/Turret.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -60,14 +60,14 @@
Turret(Context* context);
virtual ~Turret();
- virtual void rotatePitch(const Vector2& value);
- virtual void rotateYaw(const Vector2& value);
- virtual void rotateRoll(const Vector2& value);
+ virtual void rotatePitch(const Vector2& value) override;
+ virtual void rotateYaw(const Vector2& value) override;
+ virtual void rotateRoll(const Vector2& value) override;
virtual float isInRange(const WorldEntity* target);
virtual void aimAtPosition(const Vector3 &position);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void tick(float dt);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void tick(float dt) override;
/** @brief Sets the maximum distance the turret is allowed to shoot. @param radius The distance*/
inline void setMaxAttackRadius(float radius)
Modified: code/branches/cpp11_v2/src/modules/overlays/FadeoutText.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/FadeoutText.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/FadeoutText.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -43,8 +43,8 @@
FadeoutText(Context* context);
virtual ~FadeoutText() {}
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void tick(float dt);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void tick(float dt) override;
inline void setDelay(float delay)
{ this->delay_ = delay; }
@@ -57,8 +57,8 @@
{ return this->fadeouttime_; }
private:
- virtual void changedColour();
- virtual void changedCaption();
+ virtual void changedColour() override;
+ virtual void changedCaption() override;
void fadeout();
void reset();
Modified: code/branches/cpp11_v2/src/modules/overlays/GUIOverlay.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/GUIOverlay.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/GUIOverlay.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -43,13 +43,13 @@
GUIOverlay(Context* context);
virtual ~GUIOverlay();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void setGUIName(const std::string& name);
inline const std::string& getGUIName() const { return this->guiName_; }
- virtual void changedVisibility();
- virtual void changedOwner();
+ virtual void changedVisibility() override;
+ virtual void changedOwner() override;
private:
std::string guiName_;
Modified: code/branches/cpp11_v2/src/modules/overlays/OverlayText.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/OverlayText.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/OverlayText.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -51,7 +51,7 @@
OverlayText(Context* context);
virtual ~OverlayText();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void setCaption(const std::string& caption);
std::string getCaption() const;
@@ -75,7 +75,7 @@
inline float getTextSize() const { return this->getSize().y; }
protected:
- virtual void sizeChanged();
+ virtual void sizeChanged() override;
virtual void changedColour() {}
virtual void changedCaption() {}
Modified: code/branches/cpp11_v2/src/modules/overlays/debugging/DebugFPSText.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/debugging/DebugFPSText.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/debugging/DebugFPSText.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -42,7 +42,7 @@
DebugFPSText(Context* context);
virtual ~DebugFPSText();
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
};
}
#endif /* _DebugFPSText_H__ */
Modified: code/branches/cpp11_v2/src/modules/overlays/debugging/DebugPositionText.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/debugging/DebugPositionText.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/debugging/DebugPositionText.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -42,7 +42,7 @@
DebugPositionText(Context* context);
virtual ~DebugPositionText();
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
};
}
#endif /* _DebugPositionText_H__ */
Modified: code/branches/cpp11_v2/src/modules/overlays/debugging/DebugRTRText.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/debugging/DebugRTRText.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/debugging/DebugRTRText.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -42,7 +42,7 @@
DebugRTRText(Context* context);
virtual ~DebugRTRText();
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
};
}
#endif /* _DebugRTRText_H__ */
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -42,9 +42,9 @@
AnnounceMessage(Context* context);
virtual ~AnnounceMessage() {}
- virtual void changedOwner();
+ virtual void changedOwner() override;
- void announcemessage(const GametypeInfo* gtinfo, const std::string& message);
+ void announcemessage(const GametypeInfo* gtinfo, const std::string& message) override;
private:
PlayerInfo* owner_;
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/ChatOverlay.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/ChatOverlay.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/ChatOverlay.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -48,7 +48,7 @@
void setConfigValues();
protected:
- virtual void incomingChat(const std::string& message, const std::string& name);
+ virtual void incomingChat(const std::string& message, const std::string& name) override;
std::list<Ogre::DisplayString> messages_;
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/CountDown.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/CountDown.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/CountDown.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -43,9 +43,9 @@
CountDown(Context* context);
virtual ~CountDown();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void changedOwner();
- virtual void tick(float dt);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void changedOwner() override;
+ virtual void tick(float dt) override;
inline void setCounter(float value)
{ this->counter_ = value + 0.99f; }
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -42,9 +42,9 @@
DeathMessage(Context* context);
virtual ~DeathMessage() {}
- virtual void changedOwner();
+ virtual void changedOwner() override;
- void deathmessage(const GametypeInfo* gtinfo, const std::string& message);
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -42,9 +42,9 @@
GametypeFadingMessage(Context* context);
virtual ~GametypeFadingMessage();
- virtual void changedOwner();
+ virtual void changedOwner() override;
- void fadingmessage(const GametypeInfo* gtinfo, const std::string& message);
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -45,9 +45,9 @@
GametypeStaticMessage(Context* context);
virtual ~GametypeStaticMessage();
- virtual void changedOwner();
+ virtual void changedOwner() override;
- void staticmessage(const GametypeInfo* gtinfo, const std::string& message, const ColourValue& colour);
+ 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/HUDBar.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDBar.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDBar.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -50,7 +50,7 @@
BarColour(Context* context);
virtual ~BarColour() { }
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void setColour(const ColourValue& colour) { this->colour_ = colour; }
const ColourValue& getColour() const { return this->colour_; }
@@ -70,7 +70,7 @@
HUDBar(Context* context);
virtual ~HUDBar();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void clearColours();
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/HUDBoostBar.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDBoostBar.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDBoostBar.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -42,8 +42,8 @@
HUDBoostBar(Context* context);
virtual ~HUDBoostBar();
- virtual void tick(float dt);
- virtual void changedOwner();
+ virtual void tick(float dt) override;
+ virtual void changedOwner() override;
private:
SpaceShip* owner_;
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.cc 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.cc 2015-11-19 10:40:28 UTC (rev 10817)
@@ -29,6 +29,7 @@
#include "HUDEnemyHealthBar.h"
#include "core/config/ConfigValueIncludes.h"
+#include "core/CoreIncludes.h"
#include "worldentities/pawns/Pawn.h"
namespace orxonox
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -40,9 +40,9 @@
virtual ~HUDEnemyHealthBar();
void setConfigValues();
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
- void changedOwner();
+ void changedOwner() override;
private:
void updateTarget();
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/HUDHealthBar.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDHealthBar.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDHealthBar.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -44,12 +44,12 @@
HUDHealthBar(Context* context);
virtual ~HUDHealthBar();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void tick(float dt);
- virtual void changedOwner();
- virtual void changedOverlayGroup();
- virtual void changedVisibility();
- virtual void changedName();
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void tick(float dt) override;
+ virtual void changedOwner() override;
+ virtual void changedOverlayGroup() override;
+ virtual void changedVisibility() override;
+ virtual void changedName() override;
inline void setTextFont(const std::string& font)
{ if (!font.empty()) { this->textoverlay_->setFont(font); } }
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -50,21 +50,21 @@
void setConfigValues();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void tick(float dt);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void tick(float dt) override;
// RadarListener interface
- virtual void addObject(RadarViewable* object);
- virtual void removeObject(RadarViewable* viewable);
- virtual void objectChanged(RadarViewable* viewable);
+ virtual void addObject(RadarViewable* object) override;
+ virtual void removeObject(RadarViewable* viewable) override;
+ virtual void objectChanged(RadarViewable* viewable) override;
- virtual void changedOwner();
- virtual void sizeChanged();
- virtual void angleChanged() { }
- virtual void positionChanged() { }
- virtual void radarTick(float dt) {}
+ virtual void changedOwner() override;
+ virtual void sizeChanged() override;
+ virtual void angleChanged() override { }
+ virtual void positionChanged() override { }
+ virtual void radarTick(float dt) override {}
- inline float getRadarSensitivity() const
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -49,8 +49,8 @@
HUDRadar(Context* context);
virtual ~HUDRadar();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void changedOwner();
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void changedOwner() override;
void setConfigValues();
private:
@@ -79,7 +79,7 @@
std::string get3DMaterialBack() const {return this->material3DBack_; }
void set3DMaterialBack(std::string material3DBack) { this->material3DBack_ = material3DBack; }
- float getRadarSensitivity() const { return this->sensitivity_; }
+ float getRadarSensitivity() const override { return this->sensitivity_; }
// used also by RadarListener interface!
void setRadarSensitivity(float sensitivity) { this->sensitivity_ = sensitivity; }
@@ -88,10 +88,10 @@
void setMapAngle(float mapAngle) { this->mapAngle_ = mapAngle; }
// RadarListener interface
- virtual void addObject(RadarViewable* viewable);
- virtual void removeObject(RadarViewable* viewable);
- virtual void objectChanged( RadarViewable* rv );
- void radarTick(float dt);
+ virtual void addObject(RadarViewable* viewable) override;
+ virtual void removeObject(RadarViewable* viewable) override;
+ virtual void objectChanged( RadarViewable* rv ) override;
+ 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/HUDSpeedBar.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDSpeedBar.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDSpeedBar.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -43,8 +43,8 @@
HUDSpeedBar(Context* context);
virtual ~HUDSpeedBar();
- virtual void tick(float dt);
- virtual void changedOwner();
+ virtual void tick(float dt) override;
+ virtual void changedOwner() override;
private:
SpaceShip* owner_;
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/HUDTimer.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDTimer.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDTimer.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -42,9 +42,9 @@
HUDTimer(Context* context);
virtual ~HUDTimer();
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
- virtual void changedOwner();
+ virtual void changedOwner() override;
private:
ControllableEntity* owner_;
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -42,9 +42,9 @@
KillMessage(Context* context);
virtual ~KillMessage() {}
- virtual void changedOwner();
+ virtual void changedOwner() override;
- void killmessage(const GametypeInfo* gtinfo, const std::string& message);
+ void killmessage(const GametypeInfo* gtinfo, const std::string& message) override;
private:
PlayerInfo* owner_;
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/LastManStandingInfos.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/LastManStandingInfos.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/LastManStandingInfos.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -42,9 +42,9 @@
LastManStandingInfos(Context* context);
virtual ~LastManStandingInfos();
- virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void changedOwner();
+ virtual void tick(float dt) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void changedOwner() override;
inline void setShowLives(bool value)
{ this->bShowLives_ = value; }
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/LastTeamStandingInfos.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/LastTeamStandingInfos.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/LastTeamStandingInfos.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -42,9 +42,9 @@
LastTeamStandingInfos(Context* context);
virtual ~LastTeamStandingInfos();
- virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void changedOwner();
+ virtual void tick(float dt) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void changedOwner() override;
inline void setShowLives(bool value)
{ this->bShowLives_ = value; }
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/PauseNotice.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/PauseNotice.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/PauseNotice.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -41,10 +41,10 @@
public:
PauseNotice(Context* context);
- virtual void changedOwner();
+ virtual void changedOwner() override;
protected:
- virtual void changedTimeFactor(float factor_new, float factor_old);
+ virtual void changedTimeFactor(float factor_new, float factor_old) override;
private:
PlayerInfo* owner_;
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/TeamBaseMatchScore.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/TeamBaseMatchScore.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/TeamBaseMatchScore.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -42,9 +42,9 @@
TeamBaseMatchScore(Context* context);
virtual ~TeamBaseMatchScore();
- virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void changedOwner();
+ virtual void tick(float dt) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void changedOwner() override;
inline void setShowBases(bool value)
{ this->bShowBases_ = value; }
Modified: code/branches/cpp11_v2/src/modules/overlays/stats/Scoreboard.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/stats/Scoreboard.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/stats/Scoreboard.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -43,14 +43,14 @@
Scoreboard(Context* context);
virtual ~Scoreboard();
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
inline void setCreateLines(CreateLines* cl)
{ this->createlines_ = cl; }
inline CreateLines* getCreateLines() const
{ return this->createlines_; }
- virtual void changedVisibility();
+ virtual void changedVisibility() override;
private: // functions
void printLines();
Modified: code/branches/cpp11_v2/src/modules/overlays/stats/Stats.h
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/stats/Stats.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/overlays/stats/Stats.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -45,7 +45,7 @@
void setConfigValues();
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
private: // variables
Ogre::PanelOverlayElement* statsOverlayNoise_;
Modified: code/branches/cpp11_v2/src/modules/pickup/CollectiblePickup.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pickup/CollectiblePickup.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/pickup/CollectiblePickup.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -60,8 +60,8 @@
CollectiblePickup(); //!< Constructor.
virtual ~CollectiblePickup(); //! Destructor.
- virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
- virtual void changedPickedUp(void); //!< Is called when the pickup has transited from picked up to dropped or the other way around.
+ virtual void changedUsed(void) override; //!< Is called when the pickup has transited from used to unused or the other way around.
+ virtual void changedPickedUp(void) override; //!< Is called when the pickup has transited from picked up to dropped or the other way around.
/**
@brief Check whether the given CollectiblePickup is par of a PickupCollection.
Modified: code/branches/cpp11_v2/src/modules/pickup/Pickup.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pickup/Pickup.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/pickup/Pickup.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -102,9 +102,9 @@
Pickup(Context* context); //!< Constructor.
virtual ~Pickup(); //!< Destructor.
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
- virtual const std::string& getRepresentationName() const
+ virtual const std::string& getRepresentationName() const override
{ return this->representationName_; }
/**
@@ -148,10 +148,10 @@
inline bool isContinuous(void) const
{ return this->getDurationType() == pickupDurationType::continuous; }
- virtual void changedPickedUp(void); //!< Should be called when the pickup has transited from picked up to dropped or the other way around.
+ virtual void changedPickedUp(void) override; //!< Should be called when the pickup has transited from picked up to dropped or the other way around.
protected:
- virtual bool createSpawner(void); //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
+ virtual bool createSpawner(void) override; //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
/**
@brief Sets the representation name which refers to the name of the PickupRepresentation that is used to represent this pickup.
Modified: code/branches/cpp11_v2/src/modules/pickup/PickupCollection.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pickup/PickupCollection.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/pickup/PickupCollection.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -72,17 +72,17 @@
PickupCollection(Context* context); //!< Default Constructor.
virtual ~PickupCollection(); //!< Destructor.
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Creates an instance of this Class through XML.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Creates an instance of this Class through XML.
- virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
- virtual void changedCarrier(void); //!< Is called when the pickup has changed its PickupCarrier.
- virtual void changedPickedUp(void); //!< Is called when the pickup has transited from picked up to dropped or the other way around.
+ virtual void changedUsed(void) override; //!< Is called when the pickup has transited from used to unused or the other way around.
+ virtual void changedCarrier(void) override; //!< Is called when the pickup has changed its PickupCarrier.
+ virtual void changedPickedUp(void) override; //!< Is called when the pickup has transited from picked up to dropped or the other way around.
- virtual bool isTarget(const PickupCarrier* carrier) const; //!< Get whether a given class, represented by the input Identifier, is a target of this PickupCollection.
+ virtual bool isTarget(const PickupCarrier* carrier) const override; //!< Get whether a given class, represented by the input Identifier, is a target of this PickupCollection.
inline void setRepresentationName(const std::string& name)
{ this->representationName_ = name; }
- virtual const std::string& getRepresentationName() const
+ virtual const std::string& getRepresentationName() const override
{ return this->representationName_; }
bool addPickupable(CollectiblePickup* pickup); //!< Add the input Pickupable to list of Pickupables combined by this PickupCollection.
@@ -97,7 +97,7 @@
void pickupDisabled(void); //!< Informs the PickupCollection, that one of its pickups has been disabled.
protected:
- virtual bool createSpawner(void); //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
+ virtual bool createSpawner(void) override; //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
private:
void changedUsedAction(void); //!< Helper method.
Modified: code/branches/cpp11_v2/src/modules/pickup/PickupManager.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pickup/PickupManager.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/pickup/PickupManager.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -116,9 +116,9 @@
PickupRepresentation* getRepresentation(const std::string& name); // tolua_export
- virtual void pickupChangedUsed(Pickupable* pickup, bool used); //!< Is called by the PickupListener to notify the PickupManager, that the input Pickupable has transited to the input used state.
+ virtual void pickupChangedUsed(Pickupable* pickup, bool used) override; //!< Is called by the PickupListener to notify the PickupManager, that the input Pickupable has transited to the input used state.
static void pickupChangedUsedNetwork(uint32_t pickup, bool inUse, bool usable, bool unusable); //!< Helper method to react to the change in the used status of a Pickupable.
- virtual void pickupChangedPickedUp(Pickupable* pickup, bool pickedUp); //!< Is called by the PickupListener to notify the PickupManager, that the input Pickupable has transited to the input pickedUp state.
+ virtual void pickupChangedPickedUp(Pickupable* pickup, bool pickedUp) override; //!< Is called by the PickupListener to notify the PickupManager, that the input Pickupable has transited to the input pickedUp state.
static void pickupChangedPickedUpNetwork(uint32_t pickup, bool usable, uint32_t representationObjectId, const std::string& representationName, bool pickedUp); //!< Helper method to react to the change in the pickedUp status of a Pickupable.
// Methods to be used by the PickupInventory.
Modified: code/branches/cpp11_v2/src/modules/pickup/PickupRepresentation.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pickup/PickupRepresentation.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/pickup/PickupRepresentation.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -97,7 +97,7 @@
PickupRepresentation(Context* context); //!< Default constructor.
virtual ~PickupRepresentation(); //!< Destructor.
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a PickupRepresentation object through XML.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a PickupRepresentation object through XML.
/**
@brief Get the name of the Pickupable represented by this PickupRepresentation.
@@ -128,7 +128,7 @@
*/
inline const std::string& getInventoryRepresentation(void) const { return this->inventoryRepresentation_; } // tolua_export
- virtual void changedName();
+ virtual void changedName() override;
StaticEntity* createSpawnerRepresentation(PickupSpawner* spawner); //!< Create a spawnerRepresentation for a specific PickupSpawner.
Modified: code/branches/cpp11_v2/src/modules/pickup/PickupSpawner.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pickup/PickupSpawner.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/pickup/PickupSpawner.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -81,8 +81,8 @@
static PickupSpawner* createDroppedPickup(Context* context, Pickupable* pickup, PickupCarrier* carrier, float triggerDistance = 10.0);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a PickupSpawner through XML.
- virtual void tick(float dt); //!< Tick, checks if any Pawn is close enough to trigger.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a PickupSpawner through XML.
+ virtual void tick(float dt) override; //!< Tick, checks if any Pawn is close enough to trigger.
/**
@brief Get the distance in which to trigger.
Modified: code/branches/cpp11_v2/src/modules/pong/Pong.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pong/Pong.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/pong/Pong.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -67,12 +67,12 @@
Pong(Context* context); //!< Constructor. Registers and initializes the object.
virtual ~Pong(); //!< Destructor. Cleans up, if initialized.
- virtual void start(); //!< Starts the Pong minigame.
- virtual void end(); ///!< Ends the Pong minigame.
+ virtual void start() override; //!< Starts the Pong minigame.
+ virtual void end() override; ///!< Ends the Pong minigame.
- virtual void spawnPlayer(PlayerInfo* player); //!< Spawns the input player.
+ virtual void spawnPlayer(PlayerInfo* player) override; //!< Spawns the input player.
- virtual void playerScored(PlayerInfo* player, int score = 1); //!< Is called when the player scored.
+ virtual void playerScored(PlayerInfo* player, int score = 1) override; //!< Is called when the player scored.
/**
@brief Set the PongCenterpoint (the playing field).
@@ -86,7 +86,7 @@
PlayerInfo* getRightPlayer() const; //!< Get the right player.
protected:
- virtual void spawnPlayersIfRequested(); //!< Spawns players, and fills the rest up with bots.
+ virtual void spawnPlayersIfRequested() override; //!< Spawns players, and fills the rest up with bots.
void startBall(); //!< Starts the ball with some default speed.
void cleanup(); //!< Cleans up the Gametype by destroying the ball and the bats.
Modified: code/branches/cpp11_v2/src/modules/pong/PongAI.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pong/PongAI.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/pong/PongAI.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -65,7 +65,7 @@
void setConfigValues();
- virtual void tick(float dt); //!< Implements the behavior of the PongAI (i.e. its intelligence).
+ virtual void tick(float dt) override; //!< Implements the behavior of the PongAI (i.e. its intelligence).
/**
@brief Set the ball for the AI.
Modified: code/branches/cpp11_v2/src/modules/pong/PongBall.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pong/PongBall.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/pong/PongBall.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -62,9 +62,9 @@
PongBall(Context* context);
virtual ~PongBall();
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
/**
@brief Set the dimensions of the playing field.
Modified: code/branches/cpp11_v2/src/modules/pong/PongBat.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pong/PongBat.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/pong/PongBat.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -59,12 +59,12 @@
PongBat(Context* context); //!< Constructor. Registers and initializes the object.
virtual ~PongBat() {}
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
- virtual void moveFrontBack(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
- virtual void moveRightLeft(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
+ virtual void moveFrontBack(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
+ virtual void moveRightLeft(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
- virtual void changedPlayer(); //!< Is called when the player changed.
+ virtual void changedPlayer() override; //!< Is called when the player changed.
/**
@brief Set the speed of the bat.
Modified: code/branches/cpp11_v2/src/modules/pong/PongCenterpoint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pong/PongCenterpoint.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/pong/PongCenterpoint.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -123,7 +123,7 @@
PongCenterpoint(Context* context); //!< Constructor. Registers and initializes the object and checks whether the gametype is actually Pong.
virtual ~PongCenterpoint() {}
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method to create a PongCenterpoint through XML.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method to create a PongCenterpoint through XML.
/**
@brief Set the template for the ball. (e.g. to attach the model of the ball, but also to attach an EventListener to it to detect, when it hits the boundaries, and e.g. display some ParticleEffets, when it does.)
Modified: code/branches/cpp11_v2/src/modules/pong/PongScore.h
===================================================================
--- code/branches/cpp11_v2/src/modules/pong/PongScore.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/pong/PongScore.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -59,9 +59,9 @@
PongScore(Context* context);
virtual ~PongScore();
- virtual void tick(float dt); //!< Creates and sets the caption to be displayed by the PongScore.
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void changedOwner(); //!< Is called when the owner changes.
+ virtual void tick(float dt) override; //!< Creates and sets the caption to be displayed by the PongScore.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void changedOwner() override; //!< Is called when the owner changes.
/**
@brief Set whether the PongScore displays the players' names.
Modified: code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -62,13 +62,13 @@
PortalEndPoint(Context* context);
virtual ~PortalEndPoint();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void changedActivity(void);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void changedActivity(void) override;
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);
+ 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/modules/portals/PortalLink.h
===================================================================
--- code/branches/cpp11_v2/src/modules/portals/PortalLink.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/portals/PortalLink.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -55,7 +55,7 @@
public:
PortalLink(Context* context);
virtual ~PortalLink();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
inline void setFromID(unsigned int from) //!< set the ID of the PortalEndPoint which should act as the entrance of this link
{ this->fromID_ = from; }
Modified: code/branches/cpp11_v2/src/modules/questsystem/GlobalQuest.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/GlobalQuest.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/questsystem/GlobalQuest.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -92,19 +92,19 @@
GlobalQuest(Context* context);
virtual ~GlobalQuest();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a GlobalQuest object through XML.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a GlobalQuest object through XML.
- virtual bool fail(PlayerInfo* player); //!< Fails the Quest.
- virtual bool complete(PlayerInfo* player); //!< Completes the Quest.
+ virtual bool fail(PlayerInfo* player) override; //!< Fails the Quest.
+ virtual bool complete(PlayerInfo* player) override; //!< Completes the Quest.
protected:
- virtual bool isStartable(const PlayerInfo* player) const; //!< Checks whether the Quest can be started.
- virtual bool isFailable(const PlayerInfo* player) const; //!< Checks whether the Quest can be failed.
- virtual bool isCompletable(const PlayerInfo* player) const; //!< Checks whether the Quest can be completed.
+ virtual bool isStartable(const PlayerInfo* player) const override; //!< Checks whether the Quest can be started.
+ virtual bool isFailable(const PlayerInfo* player) const override; //!< Checks whether the Quest can be failed.
+ virtual bool isCompletable(const PlayerInfo* player) const override; //!< Checks whether the Quest can be completed.
- virtual QuestStatus::Value getStatus(const PlayerInfo* player) const; //!< Returns the status of the Quest for a specific player.
+ virtual QuestStatus::Value getStatus(const PlayerInfo* player) const override; //!< Returns the status of the Quest for a specific player.
- virtual bool setStatus(PlayerInfo* player, const QuestStatus::Value & status); //!< Sets the status for a specific player.
+ virtual bool setStatus(PlayerInfo* player, const QuestStatus::Value & status) override; //!< Sets the status for a specific player.
private:
std::set<PlayerInfo*> players_; //!< The set of players which possess this Quest.
Modified: code/branches/cpp11_v2/src/modules/questsystem/LocalQuest.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/LocalQuest.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/questsystem/LocalQuest.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -86,18 +86,18 @@
LocalQuest(Context* context);
virtual ~LocalQuest();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a LocalQuest object through XML.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a LocalQuest object through XML.
- virtual bool fail(PlayerInfo* player); //!< Fails the Quest.
- virtual bool complete(PlayerInfo* player); //!< Completes the Quest.
+ virtual bool fail(PlayerInfo* player) override; //!< Fails the Quest.
+ virtual bool complete(PlayerInfo* player) override; //!< Completes the Quest.
protected:
- virtual bool isStartable(const PlayerInfo* player) const; //!< Checks whether the Quest can be started.
- virtual bool isFailable(const PlayerInfo* player) const; //!< Checks whether the Quest can be failed.
- virtual bool isCompletable(const PlayerInfo* player) const; //!< Checks whether the Quest can be completed.
+ virtual bool isStartable(const PlayerInfo* player) const override; //!< Checks whether the Quest can be started.
+ virtual bool isFailable(const PlayerInfo* player) const override; //!< Checks whether the Quest can be failed.
+ virtual bool isCompletable(const PlayerInfo* player) const override; //!< Checks whether the Quest can be completed.
- virtual QuestStatus::Value getStatus(const PlayerInfo* player) const; //!< Returns the status of the Quest for a specific player.
- virtual bool setStatus(PlayerInfo* player, const QuestStatus::Value & status); //!< Sets the status for a specific player.
+ virtual QuestStatus::Value getStatus(const PlayerInfo* player) const override; //!< Returns the status of the Quest for a specific player.
+ virtual bool setStatus(PlayerInfo* player, const QuestStatus::Value & status) override; //!< Sets the status for a specific player.
private:
std::map<const PlayerInfo*, QuestStatus::Value> playerStatus_; //!< List of the status for each player, with the Player-pointer as key.
Modified: code/branches/cpp11_v2/src/modules/questsystem/Quest.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/Quest.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/questsystem/Quest.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -84,7 +84,7 @@
Quest(Context* context);
virtual ~Quest();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a Quest object through XML.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a Quest object through XML.
/**
@brief Returns the parent-quest of the Quest.
Modified: code/branches/cpp11_v2/src/modules/questsystem/QuestDescription.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/QuestDescription.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/questsystem/QuestDescription.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -66,7 +66,7 @@
QuestDescription(Context* context);
virtual ~QuestDescription();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a QuestDescription object through XML.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a QuestDescription object through XML.
// tolua_begin
/**
Modified: code/branches/cpp11_v2/src/modules/questsystem/QuestEffectBeacon.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/QuestEffectBeacon.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/questsystem/QuestEffectBeacon.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -95,8 +95,8 @@
QuestEffectBeacon(Context* context);
virtual ~QuestEffectBeacon();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a QuestEffectBeacon object through XML.
- virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a QuestEffectBeacon object through XML.
+ virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
bool execute(bool bTriggered, BaseObject* trigger); //!< Executes the QuestEffects of the QuestEffectBeacon.
Modified: code/branches/cpp11_v2/src/modules/questsystem/QuestHint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/QuestHint.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/questsystem/QuestHint.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -84,7 +84,7 @@
QuestHint(Context* context);
virtual ~QuestHint();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a QuestHint object through XML.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a QuestHint object through XML.
bool isActive(const PlayerInfo* player) const; //!< Returns true if the QuestHint is active for the input player.
Modified: code/branches/cpp11_v2/src/modules/questsystem/QuestItem.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/QuestItem.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/questsystem/QuestItem.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -62,7 +62,7 @@
QuestItem(Context* context);
virtual ~QuestItem();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a QuestItem object through XML.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a QuestItem object through XML.
/**
@brief Returns the id of this QuestItem.
Modified: code/branches/cpp11_v2/src/modules/questsystem/QuestListener.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/QuestListener.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/questsystem/QuestListener.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -89,7 +89,7 @@
QuestListener(Context* context);
virtual ~QuestListener();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a QuestListener object through XML.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a QuestListener object through XML.
static void advertiseStatusChange(std::list<QuestListener*> & listeners, const std::string & status); //!< Makes all QuestListener in the list aware that a certain status change has occured.
Modified: code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuest.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuest.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuest.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -61,9 +61,9 @@
AddQuest(Context* context);
virtual ~AddQuest();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a AddQuest object through XML.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a AddQuest object through XML.
- virtual bool invoke(PlayerInfo* player); //!< Invokes the QuestEffect.
+ virtual bool invoke(PlayerInfo* player) override; //!< Invokes the QuestEffect.
};
Modified: code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuestHint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuestHint.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuestHint.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -63,9 +63,9 @@
AddQuestHint(Context* context);
virtual ~AddQuestHint();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a AddQuestHint object through XML.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a AddQuestHint object through XML.
- virtual bool invoke(PlayerInfo* player); //!< Invokes the QuestEffect.
+ virtual bool invoke(PlayerInfo* player) override; //!< Invokes the QuestEffect.
private:
std::string hintId_; //!< The id of the QuestHint.
Modified: code/branches/cpp11_v2/src/modules/questsystem/effects/AddReward.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/effects/AddReward.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/questsystem/effects/AddReward.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -67,9 +67,9 @@
AddReward(Context* context);
virtual ~AddReward();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a AddReward object through XML.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a AddReward object through XML.
- virtual bool invoke(PlayerInfo* player); //!< Invokes the QuestEffect.
+ virtual bool invoke(PlayerInfo* player) override; //!< Invokes the QuestEffect.
private:
std::list<Rewardable*> rewards_; //!< A list of Rewardables to be added to the player invoking the QuestEffect.
Modified: code/branches/cpp11_v2/src/modules/questsystem/effects/ChangeQuestStatus.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/effects/ChangeQuestStatus.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/questsystem/effects/ChangeQuestStatus.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -58,7 +58,7 @@
ChangeQuestStatus(Context* context);
virtual ~ChangeQuestStatus();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a ChangeQuestStatus object through XML.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a ChangeQuestStatus object through XML.
virtual bool invoke(PlayerInfo* player) = 0; //!< Invokes the QuestEffect.
Modified: code/branches/cpp11_v2/src/modules/questsystem/effects/CompleteQuest.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/effects/CompleteQuest.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/questsystem/effects/CompleteQuest.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -61,9 +61,9 @@
CompleteQuest(Context* context);
virtual ~CompleteQuest();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a CompleteQuest object through XML.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a CompleteQuest object through XML.
- virtual bool invoke(PlayerInfo* player); //!< Invokes the QuestEffect.
+ virtual bool invoke(PlayerInfo* player) override; //!< Invokes the QuestEffect.
};
Modified: code/branches/cpp11_v2/src/modules/questsystem/effects/FailQuest.h
===================================================================
--- code/branches/cpp11_v2/src/modules/questsystem/effects/FailQuest.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/questsystem/effects/FailQuest.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -61,9 +61,9 @@
FailQuest(Context* context);
virtual ~FailQuest();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a FailQuest object through XML.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a FailQuest object through XML.
- virtual bool invoke(PlayerInfo* player); //!< Invokes the QuestEffect.
+ virtual bool invoke(PlayerInfo* player) override; //!< Invokes the QuestEffect.
};
Modified: code/branches/cpp11_v2/src/modules/tetris/Tetris.h
===================================================================
--- code/branches/cpp11_v2/src/modules/tetris/Tetris.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/tetris/Tetris.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -57,13 +57,13 @@
Tetris(Context* context); //!< Constructor. Registers and initializes the object.
virtual ~Tetris(); //!< Destructor. Cleans up, if initialized.
- virtual void start(void); //!< Starts the Tetris minigame.
- virtual void end(void); ///!< Ends the Tetris minigame.
+ virtual void start(void) override; //!< Starts the Tetris minigame.
+ virtual void end(void) override; ///!< Ends the Tetris minigame.
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
- virtual void spawnPlayer(PlayerInfo* player); //!< Spawns the input player.
- virtual bool playerLeft(PlayerInfo* player);
+ virtual void spawnPlayer(PlayerInfo* player) override; //!< Spawns the input player.
+ virtual bool playerLeft(PlayerInfo* player) override;
void setCenterpoint(TetrisCenterpoint* center);
@@ -76,7 +76,7 @@
Vector3 rotateVector(Vector3 position, unsigned int amount);
protected:
- virtual void spawnPlayersIfRequested(); //!< Spawns player.
+ virtual void spawnPlayersIfRequested() override; //!< Spawns player.
private:
Modified: code/branches/cpp11_v2/src/modules/tetris/TetrisBrick.h
===================================================================
--- code/branches/cpp11_v2/src/modules/tetris/TetrisBrick.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/tetris/TetrisBrick.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -56,9 +56,9 @@
TetrisBrick(Context* context); //!< Constructor. Registers and initializes the object.
virtual ~TetrisBrick() {}
- virtual void moveFrontBack(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
- virtual void moveRightLeft(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
- virtual void changedPlayer(); //!< Is called when the player changed.
+ virtual void moveFrontBack(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
+ virtual void moveRightLeft(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
+ virtual void changedPlayer() override; //!< Is called when the player changed.
bool isValidMove(const Vector3& position, bool isRotation);
unsigned int getNumberOfStones(void) const
Modified: code/branches/cpp11_v2/src/modules/tetris/TetrisCenterpoint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/tetris/TetrisCenterpoint.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/tetris/TetrisCenterpoint.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -61,7 +61,7 @@
TetrisCenterpoint(Context* context); //!< Constructor. Registers and initializes the object and checks whether the gametype is actually Tetris.
virtual ~TetrisCenterpoint() {}
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method to create a TetrisCenterpoint through XML.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method to create a TetrisCenterpoint through XML.
/**
@brief Set the width of the playing field.
Modified: code/branches/cpp11_v2/src/modules/tetris/TetrisScore.h
===================================================================
--- code/branches/cpp11_v2/src/modules/tetris/TetrisScore.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/tetris/TetrisScore.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -59,9 +59,9 @@
TetrisScore(Context* context);
virtual ~TetrisScore();
- virtual void tick(float dt); //!< Creates and sets the caption to be displayed by the TetrisScore.
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void changedOwner(); //!< Is called when the owner changes.
+ virtual void tick(float dt) override; //!< Creates and sets the caption to be displayed by the TetrisScore.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void changedOwner() override; //!< Is called when the owner changes.
private:
Tetris* owner_; //!< The Tetris game that owns this TetrisScore.
Modified: code/branches/cpp11_v2/src/modules/towerdefense/TowerDefense.h
===================================================================
--- code/branches/cpp11_v2/src/modules/towerdefense/TowerDefense.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/towerdefense/TowerDefense.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -52,10 +52,10 @@
TowerDefense(Context* context);
virtual ~TowerDefense();
void addTowerDefenseEnemy(int templatenr);
- virtual void start(); //<! The function is called when the gametype starts
- virtual void end();
- virtual void tick(float dt);
- virtual void spawnPlayer(PlayerInfo* player);
+ virtual void start() override; //<! The function is called when the gametype starts
+ virtual void end() override;
+ virtual void tick(float dt) override;
+ virtual void spawnPlayer(PlayerInfo* player) override;
PlayerInfo* getPlayer(void) const;
int getCredit(){ return this->credit_; }
void payCredit(int pay){ this->credit_ -= pay; }
Modified: code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseCenterpoint.h
===================================================================
--- code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseCenterpoint.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseCenterpoint.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -51,7 +51,7 @@
TowerDefenseCenterpoint(Context* context);
virtual ~TowerDefenseCenterpoint() {}
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
/**
@brief The width and hight in number of tiles. Default is 15 for both.
Modified: code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.h
===================================================================
--- code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -36,7 +36,7 @@
//health gibt es unter: health_
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator);
private:
Modified: code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseField.h
===================================================================
--- code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseField.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseField.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -61,7 +61,7 @@
public:
TowerDefenseField(Context* context);
virtual ~TowerDefenseField() {}
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
const bool isFree() const
{ return type_==FREE; }
virtual void create(char object, char param);
Modified: code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseHUDController.h
===================================================================
--- code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseHUDController.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseHUDController.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -52,9 +52,9 @@
virtual ~TowerDefenseHUDController();
- virtual void tick(float dt);
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void changedOwner();
+ virtual void tick(float dt) override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void changedOwner() override;
void setShowlives(bool temp)
{ this->showlives = temp; }
unsigned int getShowlives(void) const
Modified: code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseSelecter.h
===================================================================
--- code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseSelecter.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseSelecter.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -40,16 +40,16 @@
public:
TowerDefenseSelecter(Context* context); //!< Constructor. Registers and initializes the object.
virtual ~TowerDefenseSelecter();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void tick(float dt);
- virtual void moveFrontBack(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
- virtual void moveRightLeft(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
- virtual void rotateYaw(const Vector2& value);
- virtual void rotatePitch(const Vector2& value);
- virtual void rotateRoll(const Vector2& value);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void tick(float dt) override;
+ virtual void moveFrontBack(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
+ virtual void moveRightLeft(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
+ virtual void rotateYaw(const Vector2& value) override;
+ virtual void rotatePitch(const Vector2& value) override;
+ virtual void rotateRoll(const Vector2& value) override;
void fire(unsigned int firemode);
- virtual void fired(unsigned int firemode);
- virtual void boost(bool bBoost);
+ virtual void fired(unsigned int firemode) override;
+ virtual void boost(bool bBoost) override;
virtual void setSelectedPosition(TDCoordinate* newPos);
virtual void setSelectedPosition(int x, int y);
Modified: code/branches/cpp11_v2/src/modules/weapons/IceGunFreezer.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/IceGunFreezer.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/weapons/IceGunFreezer.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -54,7 +54,7 @@
public:
IceGunFreezer(Context* context);
virtual ~IceGunFreezer();
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
virtual void startFreezing();
virtual void stopFreezing();
virtual void setFreezeTime(float freezeTime);
Modified: code/branches/cpp11_v2/src/modules/weapons/RocketController.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/RocketController.cc 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/weapons/RocketController.cc 2015-11-19 10:40:28 UTC (rev 10817)
@@ -37,6 +37,7 @@
#include "worldentities/pawns/Pawn.h"
#include "projectiles/SimpleRocket.h"
#include "weaponmodes/SimpleRocketFire.h"
+#include "core/CoreIncludes.h"
namespace orxonox
{
Modified: code/branches/cpp11_v2/src/modules/weapons/RocketController.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/RocketController.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/weapons/RocketController.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -54,7 +54,7 @@
RocketController(Context* context);
virtual ~RocketController();
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
/**
@brief Get the rocket that is controlled by this controller.
@return Returns a pointer to the rocket.
Modified: code/branches/cpp11_v2/src/modules/weapons/projectiles/BillboardProjectile.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/BillboardProjectile.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/BillboardProjectile.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -60,7 +60,7 @@
virtual void setColour(const ColourValue& colour);
virtual void setMaterial(const std::string& material);
virtual const std::string& getMaterial();
- virtual void changedVisibility();
+ virtual void changedVisibility() override;
private:
BillboardSet billboard_; //!< The billboard that represents the projectile.
Modified: code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBomb.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBomb.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBomb.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -40,9 +40,9 @@
public:
GravityBomb(Context* context);
virtual ~GravityBomb();
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
- virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+ virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
void detonate();
private:
static const float LIFETIME;
Modified: code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBombField.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBombField.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBombField.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -38,7 +38,7 @@
public:
GravityBombField(Context* context);
virtual ~GravityBombField();
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
virtual void destroy();
/**
Modified: code/branches/cpp11_v2/src/modules/weapons/projectiles/IceGunProjectile.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/IceGunProjectile.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/IceGunProjectile.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -61,7 +61,7 @@
virtual void setFreezeFactor(float freezeFactor);
protected:
- virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+ virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
private:
float freezeTime_; //The duration of the freezing effect on a target
float freezeFactor_; //The strength of the freezing effect
Modified: code/branches/cpp11_v2/src/modules/weapons/projectiles/LightningGunProjectile.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/LightningGunProjectile.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/LightningGunProjectile.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -57,7 +57,7 @@
LightningGunProjectile(Context* context);
virtual ~LightningGunProjectile() {}
- virtual void setMaterial(const std::string& material);
+ virtual void setMaterial(const std::string& material) override;
private:
void registerVariables();
Modified: code/branches/cpp11_v2/src/modules/weapons/projectiles/ParticleProjectile.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/ParticleProjectile.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/ParticleProjectile.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -52,7 +52,7 @@
public:
ParticleProjectile(Context* context);
virtual ~ParticleProjectile();
- virtual void changedVisibility();
+ virtual void changedVisibility() override;
private:
ParticleInterface* particles_; //!< The particles.
Modified: code/branches/cpp11_v2/src/modules/weapons/projectiles/Projectile.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/Projectile.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/Projectile.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -63,8 +63,8 @@
void setConfigValues();
- virtual void tick(float dt);
- virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+ virtual void tick(float dt) override;
+ virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
protected:
virtual void setCollisionShapeRadius(float radius);
Modified: code/branches/cpp11_v2/src/modules/weapons/projectiles/Rocket.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/Rocket.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/Rocket.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -61,19 +61,19 @@
Rocket(Context* context);
virtual ~Rocket();
- virtual void tick(float dt); //!< Defines which actions the Rocket has to take in each tick.
+ virtual void tick(float dt) override; //!< Defines which actions the Rocket has to take in each tick.
- virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
- virtual void destroyObject(void);
+ virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
+ virtual void destroyObject(void) override;
void destructionEffect();
- virtual void moveFrontBack(const Vector2& value) {}
- virtual void moveRightLeft(const Vector2& value) {}
- virtual void moveUpDown(const Vector2& value) {}
+ virtual void moveFrontBack(const Vector2& value) override {}
+ virtual void moveRightLeft(const Vector2& value) override {}
+ virtual void moveUpDown(const Vector2& value) override {}
- virtual void rotateYaw(const Vector2& value);
- virtual void rotatePitch(const Vector2& value);
- virtual void rotateRoll(const Vector2& value);
+ virtual void rotateYaw(const Vector2& value) override;
+ virtual void rotatePitch(const Vector2& value) override;
+ virtual void rotateRoll(const Vector2& value) override;
/**
@brief Moves the Rocket in the Front/Back-direction by the specifed amount.
@@ -113,9 +113,9 @@
inline void rotateRoll(float value)
{ this->rotateRoll(Vector2(value, 0)); }
- virtual void setShooter(Pawn* shooter);
+ virtual void setShooter(Pawn* shooter) override;
- virtual void fired(unsigned int firemode);
+ virtual void fired(unsigned int firemode) override;
private:
Vector3 localAngularVelocity_; //!< Variable to temporarily store accumulated steering command input.
Modified: code/branches/cpp11_v2/src/modules/weapons/projectiles/RocketOld.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/RocketOld.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/RocketOld.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -61,19 +61,19 @@
RocketOld(Context* context);
virtual ~RocketOld();
- virtual void tick(float dt); //!< Defines which actions the RocketOld has to take in each tick.
+ virtual void tick(float dt) override; //!< Defines which actions the RocketOld has to take in each tick.
- virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
- virtual void destroyObject(void);
+ virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
+ virtual void destroyObject(void) override;
void destructionEffect();
- virtual void moveFrontBack(const Vector2& value) {}
- virtual void moveRightLeft(const Vector2& value) {}
- virtual void moveUpDown(const Vector2& value) {}
+ virtual void moveFrontBack(const Vector2& value) override {}
+ virtual void moveRightLeft(const Vector2& value) override {}
+ virtual void moveUpDown(const Vector2& value) override {}
- virtual void rotateYaw(const Vector2& value);
- virtual void rotatePitch(const Vector2& value);
- virtual void rotateRoll(const Vector2& value);
+ virtual void rotateYaw(const Vector2& value) override;
+ virtual void rotatePitch(const Vector2& value) override;
+ virtual void rotateRoll(const Vector2& value) override;
/**
@brief Moves the RocketOld in the Front/Back-direction by the specifed amount.
@@ -113,9 +113,9 @@
inline void rotateRoll(float value)
{ this->rotateRoll(Vector2(value, 0)); }
- virtual void setShooter(Pawn* shooter);
+ virtual void setShooter(Pawn* shooter) override;
- virtual void fired(unsigned int firemode);
+ virtual void fired(unsigned int firemode) override;
private:
Vector3 localAngularVelocity_; //!< Variable to temporarily store accumulated steering command input.
Modified: code/branches/cpp11_v2/src/modules/weapons/projectiles/SimpleRocket.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/SimpleRocket.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/SimpleRocket.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -61,19 +61,19 @@
public:
SimpleRocket(Context* context);
virtual ~SimpleRocket();
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
- virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+ virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
void disableFire(); //!< Method to disable the fire and stop all acceleration
- virtual void moveFrontBack(const Vector2& value){}
- virtual void moveRightLeft(const Vector2& value){}
- virtual void moveUpDown(const Vector2& value){}
+ virtual void moveFrontBack(const Vector2& value) override{}
+ virtual void moveRightLeft(const Vector2& value) override{}
+ virtual void moveUpDown(const Vector2& value) override{}
- virtual void rotateYaw(const Vector2& value);
- virtual void rotatePitch(const Vector2& value);
- virtual void rotateRoll(const Vector2& value);
+ virtual void rotateYaw(const Vector2& value) override;
+ virtual void rotatePitch(const Vector2& value) override;
+ virtual void rotateRoll(const Vector2& value) override;
void setDestroy();
/**
@@ -114,7 +114,7 @@
inline void rotateRoll(float value)
{ this->rotateRoll(Vector2(value, 0)); }
- virtual void setShooter(Pawn* shooter);
+ virtual void setShooter(Pawn* shooter) override;
inline bool hasFuel() const
{ return this->fuel_; }
Modified: code/branches/cpp11_v2/src/modules/weapons/weaponmodes/EnergyDrink.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/weaponmodes/EnergyDrink.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/weapons/weaponmodes/EnergyDrink.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -56,8 +56,8 @@
EnergyDrink(Context* context);
virtual ~EnergyDrink() {}
- virtual void fire();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void fire() override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
private:
/**
Modified: code/branches/cpp11_v2/src/modules/weapons/weaponmodes/FusionFire.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/weaponmodes/FusionFire.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/weapons/weaponmodes/FusionFire.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -53,7 +53,7 @@
FusionFire(Context* context);
virtual ~FusionFire() {}
- virtual void fire();
+ virtual void fire() override;
private:
float speed_; //!< The speed of the fusion fire weapon.
Modified: code/branches/cpp11_v2/src/modules/weapons/weaponmodes/GravityBombFire.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/weaponmodes/GravityBombFire.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/weapons/weaponmodes/GravityBombFire.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -33,7 +33,7 @@
GravityBombFire(Context* context);
virtual ~GravityBombFire();
- virtual void fire();
+ virtual void fire() override;
private:
static const float BOMB_VELOCITY; //!< The initial speed of the bomb when it is launched.
Modified: code/branches/cpp11_v2/src/modules/weapons/weaponmodes/HsW01.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/weaponmodes/HsW01.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/weapons/weaponmodes/HsW01.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -55,8 +55,8 @@
HsW01(Context* context);
virtual ~HsW01();
- virtual void fire();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void fire() override;
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
protected:
/**
Modified: code/branches/cpp11_v2/src/modules/weapons/weaponmodes/IceGun.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/weaponmodes/IceGun.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/weapons/weaponmodes/IceGun.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -53,8 +53,8 @@
IceGun(Context* context);
virtual ~IceGun();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void fire();
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void fire() override;
inline void setFreezeTime(float freezeTime)
{ this->freezeTime_ = freezeTime; }
Modified: code/branches/cpp11_v2/src/modules/weapons/weaponmodes/LaserFire.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/weaponmodes/LaserFire.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/weapons/weaponmodes/LaserFire.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -53,7 +53,7 @@
LaserFire(Context* context);
virtual ~LaserFire() {}
- virtual void fire();
+ virtual void fire() override;
private:
float speed_; //!< The speed of the fired projectile.
Modified: code/branches/cpp11_v2/src/modules/weapons/weaponmodes/LightningGun.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/weaponmodes/LightningGun.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/weapons/weaponmodes/LightningGun.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -53,7 +53,7 @@
LightningGun(Context* context);
virtual ~LightningGun();
- virtual void fire();
+ virtual void fire() override;
private:
float speed_; //!< The speed of the fired projectile.
Modified: code/branches/cpp11_v2/src/modules/weapons/weaponmodes/RocketFire.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/weaponmodes/RocketFire.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/weapons/weaponmodes/RocketFire.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -53,7 +53,7 @@
RocketFire(Context* context);
virtual ~RocketFire();
- virtual void fire();
+ virtual void fire() override;
private:
float speed_; //!< The speed of the Rocket.
Modified: code/branches/cpp11_v2/src/modules/weapons/weaponmodes/RocketFireOld.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/weaponmodes/RocketFireOld.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/weapons/weaponmodes/RocketFireOld.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -53,7 +53,7 @@
RocketFireOld(Context* context);
virtual ~RocketFireOld();
- virtual void fire();
+ virtual void fire() override;
private:
float speed_; //!< The speed of the Rocket.
Modified: code/branches/cpp11_v2/src/modules/weapons/weaponmodes/SimpleRocketFire.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/weaponmodes/SimpleRocketFire.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/weapons/weaponmodes/SimpleRocketFire.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -52,7 +52,7 @@
SimpleRocketFire(Context* context);
virtual ~SimpleRocketFire();
void deactivateFire();
- virtual void fire();
+ virtual void fire() override;
private:
float speed_; //!< The speed of the SimpleRocket.
Modified: code/branches/cpp11_v2/src/modules/weapons/weaponmodes/SplitGun.h
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/weaponmodes/SplitGun.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/modules/weapons/weaponmodes/SplitGun.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -53,8 +53,8 @@
SplitGun(Context* context);
virtual ~SplitGun();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void fire();
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void fire() override;
inline void setNumberOfSplits(int numberOfSplits)
{ this->numberOfSplits_ = numberOfSplits; }
Modified: code/branches/cpp11_v2/src/orxonox/Level.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/Level.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/Level.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -46,7 +46,7 @@
Level(Context* context);
virtual ~Level();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void playerEntered(PlayerInfo* player);
void playerLeft(PlayerInfo* player);
Modified: code/branches/cpp11_v2/src/orxonox/LevelInfo.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/LevelInfo.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/LevelInfo.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -206,7 +206,7 @@
LevelInfo(Context* context);
virtual ~LevelInfo();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Creates a LevelInfo object through XML.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Creates a LevelInfo object through XML.
/**
@brief Set the screenshot of the Level.
Modified: code/branches/cpp11_v2/src/orxonox/PlayerManager.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/PlayerManager.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/PlayerManager.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -49,8 +49,8 @@
inline const std::map<unsigned int, PlayerInfo*>& getClients() const
{ return this->clients_; }
- void clientConnected(unsigned int clientID);
- void clientDisconnected(unsigned int clientID);
+ void clientConnected(unsigned int clientID) override;
+ void clientDisconnected(unsigned int clientID) override;
void disconnectAllClients();
private:
Modified: code/branches/cpp11_v2/src/orxonox/Radar.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/Radar.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/Radar.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -53,7 +53,7 @@
Radar();
virtual ~Radar();
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
const RadarViewable* getFocus();
RadarViewable::Shape addObjectDescription(const std::string& name);
Modified: code/branches/cpp11_v2/src/orxonox/Scene.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/Scene.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/Scene.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -50,7 +50,7 @@
Scene(Context* context);
virtual ~Scene();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void registerVariables();
inline Ogre::SceneManager* getSceneManager() const
@@ -78,9 +78,9 @@
inline Radar* getRadar()
{ return this->radar_; }
- inline virtual uint32_t getSceneID() const { return this->getObjectID(); }
+ inline virtual uint32_t getSceneID() const override { return this->getObjectID(); }
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
private:
void addObject(BaseObject* object);
Modified: code/branches/cpp11_v2/src/orxonox/chat/ChatHistory.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/chat/ChatHistory.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/chat/ChatHistory.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -81,7 +81,7 @@
* \param message The incoming message
* \param senderID Identification number of the sender
*/
- virtual void incomingChat(const std::string& message, const std::string& name);
+ virtual void incomingChat(const std::string& message, const std::string& name) override;
/** Synchronize logfile onto the hard drive
*
Modified: code/branches/cpp11_v2/src/orxonox/chat/ChatInputHandler.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/chat/ChatInputHandler.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/chat/ChatInputHandler.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -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);
+ 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/chat/ChatManager.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/chat/ChatManager.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/chat/ChatManager.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -54,7 +54,7 @@
protected:
ChatManager(const ChatManager&);
- virtual void incomingChat(const std::string& message, unsigned int sourceID);
+ virtual void incomingChat(const std::string& message, unsigned int sourceID) override;
static ChatManager* singletonPtr_s;
};
Modified: code/branches/cpp11_v2/src/orxonox/collisionshapes/CollisionShape.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/collisionshapes/CollisionShape.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/collisionshapes/CollisionShape.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -60,7 +60,7 @@
CollisionShape(Context* context);
virtual ~CollisionShape();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
/**
@brief Set the position of the CollisionShape.
Modified: code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -60,7 +60,7 @@
CompoundCollisionShape(Context* context);
virtual ~CompoundCollisionShape();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void attach(CollisionShape* shape);
void detach(CollisionShape* shape);
@@ -69,11 +69,11 @@
void updateAttachedShape(CollisionShape* shape);
- virtual void changedScale();
+ virtual void changedScale() override;
private:
void updatePublicShape();
- inline virtual btCollisionShape* createNewShape() const
+ inline virtual 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/collisionshapes/WorldEntityCollisionShape.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -45,10 +45,10 @@
{ return this->worldEntityOwner_; }
protected:
- virtual void updateParent();
+ virtual void updateParent() override;
private:
- void parentChanged();
+ void parentChanged() override;
WorldEntity* worldEntityOwner_;
};
Modified: code/branches/cpp11_v2/src/orxonox/controllers/AIController.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/controllers/AIController.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/controllers/AIController.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -43,7 +43,7 @@
AIController(Context* context);
virtual ~AIController();
- virtual void tick(float dt); //<! Carrying out the targets set in action().
+ virtual void tick(float dt) override; //<! Carrying out the targets set in action().
protected:
virtual void action(); //<! action() is called in regular intervals managing the bot's behaviour ~ setting targets.
Modified: code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -41,11 +41,11 @@
ArtificialController(Context* context);
virtual ~ArtificialController();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void abandonTarget(Pawn* target);
- virtual void changedControllableEntity();
+ virtual void changedControllableEntity() override;
virtual void doFire();
void setBotLevel(float level=1.0f);
Modified: code/branches/cpp11_v2/src/orxonox/controllers/Controller.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/controllers/Controller.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/controllers/Controller.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -44,7 +44,7 @@
public:
Controller(Context* context);
virtual ~Controller();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
inline void setPlayer(PlayerInfo* player)
{ this->player_ = player; }
inline PlayerInfo* getPlayer() const
Modified: code/branches/cpp11_v2/src/orxonox/controllers/ControllerDirector.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/controllers/ControllerDirector.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/controllers/ControllerDirector.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -42,9 +42,9 @@
ControllerDirector(Context* context);
virtual ~ControllerDirector() { }
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
bool party(bool bTriggered, BaseObject* trigger);
- virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
inline void setScriptName(const std::string& name) { this->scriptname_ = name; }
inline const std::string& getScriptName() const { return this->scriptname_; }
Modified: code/branches/cpp11_v2/src/orxonox/controllers/DroneController.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/controllers/DroneController.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/controllers/DroneController.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -52,7 +52,7 @@
DroneController(Context* context);
virtual ~DroneController();
- virtual void tick(float dt); //!< The controlling happens here. This method defines what the controller has to do each tick.
+ virtual void tick(float dt) override; //!< The controlling happens here. This method defines what the controller has to do each tick.
void setOwner(Pawn* owner);
inline Pawn* getOwner() const
Modified: code/branches/cpp11_v2/src/orxonox/controllers/FormationController.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/controllers/FormationController.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/controllers/FormationController.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -49,7 +49,7 @@
virtual ~FormationController();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
static void formationflight(const bool form);
@@ -92,13 +92,13 @@
inline FormationMode getFormationMode() const
{ return this->formationMode_; }
- virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage);
+ virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage) override;
FormationController* getMaster( void ) { return myMaster_; }
FormationController* getController( void ) { return this; }
FormationController* getSlave( void ) { return this->slaves_.back(); }
- virtual void changedControllableEntity();
+ virtual void changedControllableEntity() override;
protected:
bool formationFlight_;
Modified: code/branches/cpp11_v2/src/orxonox/controllers/HumanController.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/controllers/HumanController.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/controllers/HumanController.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -46,7 +46,7 @@
HumanController(Context* context);
virtual ~HumanController();
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
static void moveFrontBack(const Vector2& value);
static void moveRightLeft(const Vector2& value);
Modified: code/branches/cpp11_v2/src/orxonox/controllers/NewHumanController.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/controllers/NewHumanController.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/controllers/NewHumanController.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -44,18 +44,18 @@
NewHumanController(Context* context);
virtual ~NewHumanController();
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
- virtual void frontback(const Vector2& value);
- virtual void yaw(const Vector2& value);
- virtual void pitch(const Vector2& value);
+ virtual void frontback(const Vector2& value) override;
+ virtual void yaw(const Vector2& value) override;
+ virtual void pitch(const Vector2& value) override;
static void accelerate();
static void decelerate();
- virtual void doFire(unsigned int firemode);
+ virtual void doFire(unsigned int firemode) override;
- virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage);
+ virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage) override;
static void unfire();
virtual void doUnfire();
@@ -64,9 +64,9 @@
static void changeMode();
- virtual void changedControllableEntity();
- virtual void doPauseControl();
- virtual void doResumeControl();
+ virtual void changedControllableEntity() override;
+ virtual void doPauseControl() override;
+ virtual void doResumeControl() override;
float getCurrentYaw(){ return this->currentYaw_; }
float getCurrentPitch(){ return this->currentPitch_; }
Modified: code/branches/cpp11_v2/src/orxonox/controllers/ScriptController.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/controllers/ScriptController.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/controllers/ScriptController.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -70,7 +70,7 @@
void takeControl(int ctrlid);
void setPlayer(PlayerInfo* player) { this->player_ = player; }
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
// LUA interface
// tolua_begin
Modified: code/branches/cpp11_v2/src/orxonox/controllers/WaypointController.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/controllers/WaypointController.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/controllers/WaypointController.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -43,7 +43,7 @@
WaypointController(Context* context);
virtual ~WaypointController();
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
protected:
Modified: code/branches/cpp11_v2/src/orxonox/controllers/WaypointPatrolController.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/controllers/WaypointPatrolController.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/controllers/WaypointPatrolController.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -42,8 +42,8 @@
WaypointPatrolController(Context* context);
virtual ~WaypointPatrolController() {}
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void tick(float dt);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void tick(float dt) override;
inline void setAlertnessRadius(float radius)
{ this->alertnessradius_ = radius; }
Modified: code/branches/cpp11_v2/src/orxonox/gamestates/GSClient.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gamestates/GSClient.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/gamestates/GSClient.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -42,9 +42,9 @@
GSClient(const GameStateInfo& info);
~GSClient();
- void activate();
- void deactivate();
- void update(const Clock& time);
+ void activate() override;
+ void deactivate() override;
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/gamestates/GSGraphics.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -52,9 +52,9 @@
GSGraphics(const GameStateInfo& info);
~GSGraphics();
- void activate();
- void deactivate();
- void update(const Clock& time);
+ void activate() override;
+ void deactivate() override;
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/gamestates/GSLevel.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -43,9 +43,9 @@
GSLevel(const GameStateInfo& info);
~GSLevel();
- void activate();
- void deactivate();
- void update(const Clock& time);
+ void activate() override;
+ void deactivate() override;
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/gamestates/GSMainMenu.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -43,9 +43,9 @@
GSMainMenu(const GameStateInfo& info);
~GSMainMenu();
- void activate();
- void deactivate();
- void update(const Clock& time);
+ void activate() override;
+ void deactivate() override;
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/gamestates/GSMasterServer.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -44,9 +44,9 @@
GSMasterServer(const GameStateInfo& info);
~GSMasterServer();
- void activate();
- void deactivate();
- void update(const Clock& time);
+ void activate() override;
+ void deactivate() override;
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -43,9 +43,9 @@
static void printObjects();
- void activate();
- void deactivate();
- void update(const Clock& time);
+ void activate() override;
+ void deactivate() override;
+ void update(const Clock& time) override;
// this has to be public because proteced triggers a bug in msvc
// when taking the function address.
@@ -58,7 +58,7 @@
static void delayedStartMainMenu(void);
protected:
- virtual void changedTimeFactor(float factor_new, float factor_old);
+ virtual void changedTimeFactor(float factor_new, float factor_old) override;
private:
bool bPaused_;
Modified: code/branches/cpp11_v2/src/orxonox/gamestates/GSServer.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gamestates/GSServer.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/gamestates/GSServer.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -42,9 +42,9 @@
GSServer(const GameStateInfo& info);
~GSServer();
- void activate();
- void deactivate();
- void update(const Clock& time);
+ void activate() override;
+ void deactivate() override;
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/gamestates/GSStandalone.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -40,9 +40,9 @@
GSStandalone(const GameStateInfo& info);
~GSStandalone();
- void activate();
- void deactivate();
- void update(const Clock& time);
+ void activate() override;
+ void deactivate() override;
+ void update(const Clock& time) override;
private:
};
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/Asteroids.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/Asteroids.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/Asteroids.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -40,16 +40,16 @@
Asteroids(Context* context);
virtual ~Asteroids() {}
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
- virtual void start();
- virtual void end();
+ virtual void start() override;
+ virtual void end() override;
inline void firstCheckpointReached(bool reached)
{ this->firstCheckpointReached_ = reached; }
protected:
- virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr);
+ virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr) override;
private:
bool firstCheckpointReached_;
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/Deathmatch.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/Deathmatch.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/Deathmatch.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -40,14 +40,14 @@
Deathmatch(Context* context);
virtual ~Deathmatch() {}
- virtual void start();
- virtual void end();
- virtual void playerEntered(PlayerInfo* player);
- virtual bool playerLeft(PlayerInfo* player);
- virtual bool playerChangedName(PlayerInfo* player);
+ virtual void start() override;
+ virtual void end() override;
+ virtual void playerEntered(PlayerInfo* player) override;
+ virtual bool playerLeft(PlayerInfo* player) override;
+ virtual bool playerChangedName(PlayerInfo* player) override;
- virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr);
- virtual void playerScored(PlayerInfo* player, int score = 1);
+ virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr) override;
+ virtual void playerScored(PlayerInfo* player, int score = 1) override;
};
}
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -63,22 +63,22 @@
bool friendlyfire; //goal: player can switch it on/off
bool tutorial; //goal: new players receive messages how the new gametype works - later it can be switched off.
- virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr); //ok - score function and management of parties
- virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr); //ok - simple
- virtual void start();
- virtual void end(); //Wie geht das mit der Punkteausgabe aendern? Z.B: Persoenliche Nachricht?
- virtual void playerEntered(PlayerInfo* player);
- virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn);//is used to initialize the player's party and colour
- virtual bool playerLeft(PlayerInfo* player);
- virtual bool playerChangedName(PlayerInfo* player);//unchanged
+ virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr) override; //ok - score function and management of parties
+ virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr) override; //ok - simple
+ virtual void start() override;
+ virtual void end() override; //Wie geht das mit der Punkteausgabe aendern? Z.B: Persoenliche Nachricht?
+ virtual void playerEntered(PlayerInfo* player) override;
+ virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn) override;//is used to initialize the player's party and colour
+ virtual bool playerLeft(PlayerInfo* player) override;
+ virtual bool playerChangedName(PlayerInfo* player) override;//unchanged
/*virtual void instructions();
virtual void furtherInstructions();*/
virtual void rewardPig();
void grantPigBoost(SpaceShip* spaceship); // Grant the piggy a boost.
void resetSpeedFactor(SpaceShip* spaceship);
- void tick (float dt);// used to end the game
- SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
+ void tick (float dt) override;// used to end the game
+ SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const override;
protected:
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -75,7 +75,7 @@
void setConfigValues();
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
inline const GametypeInfo* getGametypeInfo() const
{ return this->gtinfo_; }
@@ -174,8 +174,8 @@
virtual void spawnPlayersIfRequested();
virtual void spawnDeadPlayersIfRequested();
- virtual GSLevelMementoState* exportMementoState();
- virtual void importMementoState(const std::vector<GSLevelMementoState*>& states);
+ virtual GSLevelMementoState* exportMementoState() override;
+ virtual void importMementoState(const std::vector<GSLevelMementoState*>& states) override;
WeakPtr<GametypeInfo> gtinfo_;
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/LastManStanding.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/LastManStanding.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/LastManStanding.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -60,7 +60,7 @@
bool bNoPunishment; //!< Config value to switch off Punishment function if it is set to true.
bool bHardPunishment; //!< Switches between damage and death as punishment.
float punishDamageRate; //!< Makes Damage adjustable.
- virtual void spawnDeadPlayersIfRequested(); //!< Prevents dead players to respawn.
+ virtual void spawnDeadPlayersIfRequested() override; //!< Prevents dead players to respawn.
virtual int getMinLives(); //!< Returns minimum of each player's lives; players with 0 lives are skipped;
public:
@@ -68,18 +68,18 @@
virtual ~LastManStanding() {} //!< Default Destructor.
void setConfigValues(); //!< Makes values configurable.
- virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr); //!< If a player shoot's an opponent, his punishment countdown will be resetted.
- virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr); //!< Manages each players lives.
+ virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr) override; //!< If a player shoot's an opponent, his punishment countdown will be resetted.
+ virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr) override; //!< Manages each players lives.
- virtual void end(); //!< Sends an end message.
+ virtual void end() override; //!< Sends an end message.
int playerGetLives(PlayerInfo* player); //!< getFunction for the map "playerLives_".
int getNumPlayersAlive() const; //!< Returns the number of players that are still alive.
- virtual void playerEntered(PlayerInfo* player); //!< Initializes values.
- virtual bool playerLeft(PlayerInfo* player); //!< Manages all local variables.
- virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn); //!< Resets punishment time and respawn delay.
+ virtual void playerEntered(PlayerInfo* player) override; //!< Initializes values.
+ virtual bool playerLeft(PlayerInfo* player) override; //!< Manages all local variables.
+ 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); //!< used to end the game
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/LastTeamStanding.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -66,21 +66,21 @@
std::map<PlayerInfo*, float> playerDelayTime_; //!< Stores each Player's delay time.
std::map<PlayerInfo*, bool> inGame_; //!< Indicates each Player's state.
- virtual void spawnDeadPlayersIfRequested(); //!< Prevents dead players to respawn.
+ virtual void spawnDeadPlayersIfRequested() override; //!< Prevents dead players to respawn.
virtual int getMinLives(); //!< Returns minimum of each player's lives; players with 0 lives are skipped;
public:
LastTeamStanding(Context* context); //!< Default Constructor.
virtual ~LastTeamStanding(); //!< Default Destructor.
- virtual void playerEntered(PlayerInfo* player); //!< Initializes values.
- virtual bool playerLeft(PlayerInfo* player); //!< Manages all local variables.
+ virtual void playerEntered(PlayerInfo* player) override; //!< Initializes values.
+ virtual bool playerLeft(PlayerInfo* player) override; //!< Manages all local variables.
- virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr); //!< Manages each player's lost lives.
- virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr); //!< If a player shoot's an opponent, his punishment countdown will be resetted.
- virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn); //!< Resets punishment time and respawn delay.
- void tick (float dt); //!< used to end the game
- virtual void end(); //!< Sends an end message.
+ 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 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_".
inline int getNumTeamsAlive() const//!< Returns the number of players that are still alive.
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/Mission.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/Mission.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/Mission.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -41,12 +41,12 @@
Mission(Context* context);
virtual ~Mission() {}
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
- virtual void start();
- virtual void end();
+ virtual void start() override;
+ virtual void end() override;
virtual void setTeams();
- virtual void addBots(unsigned int amount){} //<! overwrite function in order to bypass the addbots command
+ virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command
inline void setLives(unsigned int amount)
{this->lives_ = amount;}
inline unsigned int getLives()
@@ -57,7 +57,7 @@
static void setLivesWrapper(unsigned int amount);
protected:
- virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr);
+ virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr) override;
bool missionAccomplished_; //<! indicates if player successfully finsihed the mission;
int lives_; //<! amount of player's lives <-> nr. of retries
//<! If the lives_ are set negative -> unlimited lives.
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -43,10 +43,10 @@
TeamBaseMatch(Context* context);
virtual ~TeamBaseMatch() {}
- virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr);
- virtual bool allowPawnDamage(Pawn* victim, Pawn* originator);
+ virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr) override;
+ virtual bool allowPawnDamage(Pawn* victim, Pawn* originator) override;
- virtual void playerScored(PlayerInfo* player, int score = 1);
+ virtual void playerScored(PlayerInfo* player, int score = 1) override;
virtual void showPoints();
virtual void endGame();
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/TeamDeathmatch.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/TeamDeathmatch.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/TeamDeathmatch.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -41,14 +41,14 @@
virtual ~TeamDeathmatch() {}
void setConfigValues();
- virtual void start();
- virtual void end();
- virtual void playerEntered(PlayerInfo* player);
- virtual bool playerLeft(PlayerInfo* player);
- virtual bool playerChangedName(PlayerInfo* player);
+ virtual void start() override;
+ virtual void end() override;
+ virtual void playerEntered(PlayerInfo* player) override;
+ virtual bool playerLeft(PlayerInfo* player) override;
+ virtual bool playerChangedName(PlayerInfo* player) override;
- virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr);
- virtual void playerScored(PlayerInfo* player, int score = 1);
+ virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr) override;
+ virtual void playerScored(PlayerInfo* player, int score = 1) override;
protected:
int maxScore_;
};
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -45,16 +45,16 @@
void setConfigValues();
- virtual void playerEntered(PlayerInfo* player);
+ virtual void playerEntered(PlayerInfo* player) override;
virtual void findAndSetTeam(PlayerInfo* player);
- virtual bool playerLeft(PlayerInfo* player);
- virtual void spawnDeadPlayersIfRequested(); //!< Prevents players to respawn.
+ virtual bool playerLeft(PlayerInfo* player) override;
+ virtual void spawnDeadPlayersIfRequested() override; //!< Prevents players to respawn.
- virtual bool allowPawnHit(Pawn* victim, Pawn* originator = nullptr);
- virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr);
- virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr);
+ virtual bool allowPawnHit(Pawn* victim, Pawn* originator = nullptr) override;
+ virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr) override;
+ virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr) override;
- virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn);
+ virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn) override;
int getTeam(PlayerInfo* player);
@@ -66,7 +66,7 @@
int getHumansInTeam(int team);
protected:
- virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
+ virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const override;
bool pawnsAreInTheSameTeam(Pawn* pawn1, Pawn* pawn2);
bool allowFriendlyFire_; //!< friendlyfire is per default switched off: friendlyFire_ = false;
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -42,15 +42,15 @@
virtual ~UnderAttack() {}
void setConfigValues();
- void tick (float dt);
+ void tick (float dt) override;
void addDestroyer(Destroyer* destroyer);
inline Destroyer* getDestroyer() const
{ return this->destroyer_; }
- virtual bool allowPawnHit(Pawn* victim, Pawn* originator = nullptr);
- virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr);
- virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr);
- virtual void playerEntered(PlayerInfo* player);
+ virtual bool allowPawnHit(Pawn* victim, Pawn* originator = nullptr) override;
+ virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr) override;
+ virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr) override;
+ virtual void playerEntered(PlayerInfo* player) override;
protected:
virtual void killedDestroyer();
Modified: code/branches/cpp11_v2/src/orxonox/graphics/AnimatedModel.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/graphics/AnimatedModel.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/graphics/AnimatedModel.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -43,14 +43,14 @@
AnimatedModel(Context* context);
virtual ~AnimatedModel();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void registerVariables();
virtual void changedAnimationState();
virtual void setAnimationState(bool loop, bool enabled, const std::string& state);
virtual void setAnimEnabled(bool enabled);
virtual void setAnimLoop(bool loop);
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
virtual void changedMesh();
Modified: code/branches/cpp11_v2/src/orxonox/graphics/Backlight.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/graphics/Backlight.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/graphics/Backlight.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -43,10 +43,10 @@
Backlight(Context* context);
virtual ~Backlight();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
- virtual void tick(float dt);
- virtual void changedVisibility();
+ virtual void tick(float dt) override;
+ virtual void changedVisibility() override;
inline void setWidth(float width)
{ this->width_ = width; this->update_width(); }
@@ -73,17 +73,17 @@
inline const std::string& getTrailMaterial() const
{ return this->trailmaterial_; }
- virtual void changedScale();
+ virtual void changedScale() override;
protected:
- virtual void changedTimeFactor(float factor_new, float factor_old);
+ virtual void changedTimeFactor(float factor_new, float factor_old) override;
private:
void registerVariables();
- virtual void startturnonoff();
- virtual void stopturnonoff();
- virtual void poststopturnonoff();
- virtual void changedColour();
+ virtual void startturnonoff() override;
+ virtual void stopturnonoff() override;
+ virtual void poststopturnonoff() override;
+ virtual void changedColour() override;
void update_width();
void update_lifetime();
void update_length();
Modified: code/branches/cpp11_v2/src/orxonox/graphics/Billboard.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/graphics/Billboard.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/graphics/Billboard.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -46,9 +46,9 @@
Billboard(Context* context);
virtual ~Billboard();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
- virtual void changedVisibility();
+ virtual void changedVisibility() override;
inline const BillboardSet& getBillboardSet() const
{ return this->billboard_; }
@@ -70,7 +70,7 @@
{ return this->rotation_; }
- virtual void setTeamColour(const ColourValue& colour)
+ virtual void setTeamColour(const ColourValue& colour) override
{ this->setColour(colour); }
void setBillboardType(Ogre::BillboardType bbt);
Modified: code/branches/cpp11_v2/src/orxonox/graphics/BlinkingBillboard.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/graphics/BlinkingBillboard.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/graphics/BlinkingBillboard.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -43,9 +43,9 @@
BlinkingBillboard(Context* context);
virtual ~BlinkingBillboard();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
inline void setAmplitude(float amplitude)
{ this->amplitude_ = amplitude; }
Modified: code/branches/cpp11_v2/src/orxonox/graphics/Camera.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/graphics/Camera.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/graphics/Camera.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -49,7 +49,7 @@
virtual ~Camera();
void setConfigValues();
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
void requestFocus();
void releaseFocus();
@@ -71,7 +71,7 @@
void configvaluecallback_changedFovAndAspectRatio();
void configvaluecallback_changedNearClipDistance();
- void windowResized(unsigned int newWidth, unsigned int newHeight);
+ void windowResized(unsigned int newWidth, unsigned int newHeight) override;
Ogre::Camera* camera_;
Ogre::SceneNode* cameraNode_;
Modified: code/branches/cpp11_v2/src/orxonox/graphics/FadingBillboard.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/graphics/FadingBillboard.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/graphics/FadingBillboard.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -44,11 +44,11 @@
FadingBillboard(Context* context);
virtual ~FadingBillboard();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
- virtual void tick(float dt);
- virtual void changedActivity();
- virtual void changedVisibility();
+ virtual void tick(float dt) override;
+ virtual void changedActivity() override;
+ virtual void changedVisibility() override;
inline void setTurnOnTime(float turnontime)
{ this->turnontime_ = turnontime; }
@@ -68,7 +68,7 @@
virtual void startturnonoff();
virtual void stopturnonoff();
virtual void poststopturnonoff();
- virtual void changedColour();
+ virtual void changedColour() override;
float turnontime_;
float turnofftime_;
Modified: code/branches/cpp11_v2/src/orxonox/graphics/GlobalShader.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/graphics/GlobalShader.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/graphics/GlobalShader.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -43,9 +43,9 @@
GlobalShader(Context* context);
virtual ~GlobalShader();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
- virtual void changedVisibility();
+ virtual void changedVisibility() override;
inline const Shader& getShader() const
{ return this->shader_; }
Modified: code/branches/cpp11_v2/src/orxonox/graphics/Light.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/graphics/Light.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/graphics/Light.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -55,9 +55,9 @@
Light(Context* context);
virtual ~Light();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
- virtual void changedVisibility();
+ virtual void changedVisibility() override;
inline Ogre::Light* getLight()
{ return this->light_; }
@@ -77,7 +77,7 @@
inline const ColourValue& getSpecularColour() const
{ return this->specular_; }
- virtual void setTeamColour(const ColourValue& colour)
+ virtual void setTeamColour(const ColourValue& colour) override
{ this->setDiffuseColour(colour); this->setSpecularColour(colour); }
/**
Modified: code/branches/cpp11_v2/src/orxonox/graphics/MeshLodInformation.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/graphics/MeshLodInformation.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/graphics/MeshLodInformation.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -49,7 +49,7 @@
unsigned int getNumLevels(){ return this->numLevels_; }
float getReductionRate(){ return this->reductionRate_; }
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
private:
void setLodLevel(float lodLevel);
Modified: code/branches/cpp11_v2/src/orxonox/graphics/Model.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/graphics/Model.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/graphics/Model.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -45,9 +45,9 @@
void setConfigValues();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
- virtual void changedVisibility();
+ virtual void changedVisibility() override;
inline const Mesh& getMesh() const
{ return this->mesh_; }
Modified: code/branches/cpp11_v2/src/orxonox/graphics/ParticleEmitter.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/graphics/ParticleEmitter.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/graphics/ParticleEmitter.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -42,10 +42,10 @@
ParticleEmitter(Context* context);
virtual ~ParticleEmitter();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
- virtual void changedVisibility();
- virtual void changedActivity();
+ virtual void changedVisibility() override;
+ virtual void changedActivity() override;
inline ParticleInterface* getParticleInterface() const
{ return this->particles_; }
Modified: code/branches/cpp11_v2/src/orxonox/graphics/ParticleSpawner.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/graphics/ParticleSpawner.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/graphics/ParticleSpawner.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -42,8 +42,8 @@
ParticleSpawner(Context* context);
virtual ~ParticleSpawner();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
inline void stop(bool bDestroy)
{ this->bForceDestroy_ = bDestroy; this->stopParticleSpawner(); }
Modified: code/branches/cpp11_v2/src/orxonox/infos/Bot.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/infos/Bot.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/infos/Bot.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -44,11 +44,11 @@
void setConfigValues();
- inline bool isInitialized() const
+ inline bool isInitialized() const override
{ return true; }
- inline float getPing() const
+ inline float getPing() const override
{ return 0; }
- inline float getPacketLossRatio() const
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/infos/HumanPlayer.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -44,13 +44,13 @@
void setConfigValues();
- bool isInitialized() const;
- float getPing() const;
- float getPacketLossRatio() const;
+ bool isInitialized() const override;
+ float getPing() const override;
+ float getPacketLossRatio() const override;
void setClientID(unsigned int clientID);
- virtual void switchGametype(Gametype* gametype);
+ virtual void switchGametype(Gametype* gametype) override;
inline void setHumanHUDTemplate(const std::string& name)
{
Modified: code/branches/cpp11_v2/src/orxonox/infos/PlayerInfo.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/infos/PlayerInfo.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/infos/PlayerInfo.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -43,7 +43,7 @@
PlayerInfo(Context* context);
virtual ~PlayerInfo();
- virtual void changedName();
+ virtual void changedName() override;
virtual void switchGametype(Gametype* gametype);
virtual void changedController() {}
Modified: code/branches/cpp11_v2/src/orxonox/interfaces/PickupCarrier.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/interfaces/PickupCarrier.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/interfaces/PickupCarrier.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -76,7 +76,7 @@
public:
PickupCarrier(); //!< Constructor.
virtual ~PickupCarrier(); //!< Destructor.
- void preDestroy(void); //!< Is called before the PickupCarrier is effectively destroyed.
+ 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/interfaces/Pickupable.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/interfaces/Pickupable.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/interfaces/Pickupable.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -143,7 +143,7 @@
void destroy(void); //!< Is called internally within the Pickupable module to destroy pickups.
protected:
- virtual void preDestroy(void); //!< A method that is called by Destroyable::destroy() before the object is actually destroyed.
+ virtual void preDestroy(void) override; //!< A method that is called by Destroyable::destroy() before the object is actually destroyed.
virtual void destroyPickup(void); //!< Destroys a Pickupable.
virtual void carrierDestroyed(void); //!< Is called by the PickupCarrier when it is being destroyed.
@@ -181,7 +181,7 @@
// For implementing the Rewardable interface:
public:
- virtual bool reward(PlayerInfo* player); //!< Method to transcribe a Pickupable as a Rewardable to the player.
+ virtual bool reward(PlayerInfo* player) override; //!< Method to transcribe a Pickupable as a Rewardable to the player.
};
Modified: code/branches/cpp11_v2/src/orxonox/items/Engine.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/items/Engine.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/items/Engine.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -58,7 +58,7 @@
Engine(Context* context);
virtual ~Engine();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void setConfigValues();
virtual void run(float dt); // Run the engine for a given time interval.
Modified: code/branches/cpp11_v2/src/orxonox/items/MultiStateEngine.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/items/MultiStateEngine.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/items/MultiStateEngine.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -51,11 +51,11 @@
MultiStateEngine(Context* context);
virtual ~MultiStateEngine();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
- virtual void run(float dt);
+ virtual void run(float dt) override;
- virtual void addToSpaceShip(SpaceShip* ship);
+ virtual void addToSpaceShip(SpaceShip* ship) override;
void addEffectContainer(EffectContainer* effect);
EffectContainer* getEffectContainer(unsigned int index) const;
Modified: code/branches/cpp11_v2/src/orxonox/items/PartDestructionEvent.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/items/PartDestructionEvent.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/items/PartDestructionEvent.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -99,7 +99,7 @@
PartDestructionEvent(Context* context);
virtual ~PartDestructionEvent();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void execute();
Modified: code/branches/cpp11_v2/src/orxonox/items/ShipPart.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/items/ShipPart.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/items/ShipPart.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -46,7 +46,7 @@
ShipPart(Context* context);
virtual ~ShipPart();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
virtual void handleHit(float damage, float healthdamage, float shielddamage, Pawn* originator);
Modified: code/branches/cpp11_v2/src/orxonox/overlays/GUISheet.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/overlays/GUISheet.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/overlays/GUISheet.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -43,7 +43,7 @@
GUISheet(Context* context);
~GUISheet();
- void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/overlays/InGameConsole.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -52,8 +52,8 @@
void initialise();
void setConfigValues();
- void preUpdate(const Clock& time);
- void postUpdate(const Clock& time) { /*no action*/ }
+ void preUpdate(const Clock& time) override;
+ void postUpdate(const Clock& time) override { /*no action*/ }
static void openConsole();
static void closeConsole();
@@ -64,19 +64,19 @@
void activate();
void deactivate();
- void linesChanged();
- void lineAdded();
- void inputChanged();
- void cursorChanged();
- void executed();
- void exit();
+ void linesChanged() override;
+ void lineAdded() override;
+ void inputChanged() override;
+ void cursorChanged() override;
+ void executed() override;
+ 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);
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/overlays/OrxonoxOverlay.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -89,9 +89,9 @@
OrxonoxOverlay(Context* context);
virtual ~OrxonoxOverlay();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
- virtual void changedName();
+ virtual void changedName() override;
//! Shows the overlay with an detour to BaseObject::visibility_
void show() { this->setVisible(true); }
@@ -166,7 +166,7 @@
void setBackgroundColour(ColourValue colour);
- virtual void changedVisibility();
+ virtual void changedVisibility() override;
inline void setOwner(BaseObject* owner)
{
@@ -205,7 +205,7 @@
RotationState rotState_; //!< horizontal, vertical or inbetween
private:
- void windowResized(unsigned int newWidth, unsigned int newHeight);
+ 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/overlays/OverlayGroup.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -57,7 +57,7 @@
//! Empty destructor.
~OverlayGroup();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
static void toggleVisibility(const std::string& name);
static void show(const std::string& name);
@@ -67,7 +67,7 @@
inline const std::set<StrongPtr<OrxonoxOverlay>>& getOverlays() const
{ return this->hudElements_; }
- virtual void changedVisibility();
+ virtual void changedVisibility() override;
void setOwner(BaseObject* owner);
inline BaseObject* getOwner() const
Modified: code/branches/cpp11_v2/src/orxonox/sound/AmbientSound.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/sound/AmbientSound.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/sound/AmbientSound.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -49,9 +49,9 @@
public:
AmbientSound();
- void play();
- bool stop();
- void pause();
+ void play() override;
+ bool stop() override;
+ void pause() override;
bool setAmbientSource(const std::string& source);
inline const std::string& getAmbientSource() const
@@ -65,9 +65,9 @@
~AmbientSound() { }
private:
- void preDestroy();
- float getRealVolume();
- bool moodChanged(const std::string& mood);
+ void preDestroy() override;
+ float getRealVolume() override;
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/sound/SoundManager.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -67,8 +67,8 @@
SoundManager();
~SoundManager();
- void preUpdate(const Clock& time);
- void postUpdate(const Clock& time) { /*no action*/ }
+ void preUpdate(const Clock& time) override;
+ 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-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/sound/WorldAmbientSound.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -49,10 +49,10 @@
WorldAmbientSound(Context* context);
virtual ~WorldAmbientSound();
- void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+ void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
- virtual void changedActivity();
+ virtual void changedActivity() override;
void play();
Modified: code/branches/cpp11_v2/src/orxonox/sound/WorldSound.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/sound/WorldSound.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/sound/WorldSound.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -46,19 +46,19 @@
public:
WorldSound(Context* context);
- void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
- void changedActivity();
+ void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
+ void changedActivity() override;
- void tick(float dt);
+ void tick(float dt) override;
protected:
~WorldSound() {}
private:
void registerVariables();
- void initialiseSource();
- float getRealVolume();
+ void initialiseSource() override;
+ float getRealVolume() override;
};
}
Modified: code/branches/cpp11_v2/src/orxonox/weaponsystem/DefaultWeaponmodeLink.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/weaponsystem/DefaultWeaponmodeLink.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/weaponsystem/DefaultWeaponmodeLink.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -41,7 +41,7 @@
DefaultWeaponmodeLink(Context* context);
virtual ~DefaultWeaponmodeLink();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
inline void setFiremode(const unsigned int firemode)
{ this->firemode_ = firemode; }
Modified: code/branches/cpp11_v2/src/orxonox/weaponsystem/Weapon.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/weaponsystem/Weapon.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/weaponsystem/Weapon.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -49,7 +49,7 @@
Weapon(Context* context);
virtual ~Weapon();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void fire(unsigned int mode);
void reload();
Modified: code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponMode.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponMode.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponMode.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -50,7 +50,7 @@
WeaponMode(Context* context);
virtual ~WeaponMode();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
bool fire(float* reloadTime);
bool reload();
Modified: code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponPack.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponPack.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponPack.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -43,7 +43,7 @@
WeaponPack(Context* context);
virtual ~WeaponPack();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void fire(unsigned int weaponmode);
void reload();
Modified: code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSet.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSet.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSet.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -43,7 +43,7 @@
WeaponSet(Context* context);
virtual ~WeaponSet();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void fire();
void reload();
Modified: code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -61,7 +61,7 @@
WeaponSlot(Context* context);
virtual ~WeaponSlot();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void attachWeapon(Weapon * weapon);
void removeWeapon();
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/CameraPosition.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/CameraPosition.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/CameraPosition.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -40,7 +40,7 @@
CameraPosition(Context* context);
virtual ~CameraPosition();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
inline void setDrag(bool bDrag)
{ this->bDrag_ = bDrag; }
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -53,8 +53,8 @@
ControllableEntity(Context* context);
virtual ~ControllableEntity();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void tick(float dt);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void tick(float dt) override;
void setConfigValues();
virtual void changedPlayer() {}
@@ -140,10 +140,10 @@
using MobileEntity::setVelocity;
using MobileEntity::setAngularVelocity;
- void setPosition(const Vector3& position);
- void setOrientation(const Quaternion& orientation);
- void setVelocity(const Vector3& velocity);
- void setAngularVelocity(const Vector3& velocity);
+ void setPosition(const Vector3& position) override;
+ void setOrientation(const Quaternion& orientation) override;
+ void setVelocity(const Vector3& velocity) override;
+ void setAngularVelocity(const Vector3& velocity) override;
inline bool hasLocalController() const
{ return this->bHasLocalController_; }
@@ -176,14 +176,14 @@
{ return this->team_; }
protected:
- virtual void preDestroy();
+ virtual void preDestroy() override;
virtual void setPlayer(PlayerInfo* player); // don't call this directly, use friend class PlayerInfo instead
virtual void removePlayer(); // don't call this directly, use friend class PlayerInfo instead
virtual void startLocalHumanControl();
virtual void stopLocalHumanControl();
- virtual void parentChanged();
+ virtual void parentChanged() override;
inline void setHudTemplate(const std::string& name)
{ this->hudtemplate_ = name; }
@@ -213,7 +213,7 @@
void networkcallback_changedplayerID();
// Bullet btMotionState related
- void setWorldTransform(const btTransform& worldTrans);
+ void setWorldTransform(const btTransform& worldTrans) override;
unsigned int server_overwrite_;
unsigned int client_overwrite_;
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/Drone.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/Drone.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/Drone.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -49,17 +49,17 @@
Drone(Context* context);
virtual ~Drone();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a Drone through XML.
- virtual void tick(float dt); //!< Defines which actions the Drone has to take in each tick.
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a Drone through XML.
+ virtual void tick(float dt) override; //!< Defines which actions the Drone has to take in each tick.
- virtual void moveFrontBack(const Vector2& value);
- virtual void moveRightLeft(const Vector2& value);
- virtual void moveUpDown(const Vector2& value);
+ virtual void moveFrontBack(const Vector2& value) override;
+ virtual void moveRightLeft(const Vector2& value) override;
+ virtual void moveUpDown(const Vector2& value) override;
- virtual void rotateYaw(const Vector2& value);
- virtual void rotatePitch(const Vector2& value);
- virtual void rotateRoll(const Vector2& value);
+ virtual void rotateYaw(const Vector2& value) override;
+ virtual void rotatePitch(const Vector2& value) override;
+ virtual void rotateRoll(const Vector2& value) override;
/**
@brief Moves the Drone in the Front/Back-direction by the specifed amount.
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/EffectContainer.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/EffectContainer.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/EffectContainer.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -42,7 +42,7 @@
EffectContainer(Context* context);
virtual ~EffectContainer();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void setLuaState(LuaState* state, const std::string& functionName);
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/ExplosionChunk.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/ExplosionChunk.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/ExplosionChunk.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -42,7 +42,7 @@
ExplosionChunk(Context* context);
virtual ~ExplosionChunk();
- virtual void tick(float dt);
+ virtual void tick(float dt) override;
inline void setLOD(LODParticle::Value level)
{ this->LOD_ = level; this->LODchanged(); }
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/MobileEntity.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/MobileEntity.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/MobileEntity.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -54,16 +54,16 @@
MobileEntity(Context* context);
virtual ~MobileEntity();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void tick(float dt);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void tick(float dt) override;
- virtual void setPosition(const Vector3& position);
- virtual void setOrientation(const Quaternion& orientation);
+ virtual void setPosition(const Vector3& position) override;
+ virtual void setOrientation(const Quaternion& orientation) override;
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
+ inline const Vector3& getVelocity() const override
{ return this->linearVelocity_; }
/**
@brief Get the velocity in the coordinate-system of the MoblieEntity.
@@ -107,8 +107,8 @@
protected:
// Bullet btMotionState related
- virtual void setWorldTransform(const btTransform& worldTrans);
- void getWorldTransform(btTransform& worldTrans) const;
+ virtual void setWorldTransform(const btTransform& worldTrans) override;
+ void getWorldTransform(btTransform& worldTrans) const override;
Vector3 linearAcceleration_;
Vector3 linearVelocity_;
@@ -116,7 +116,7 @@
Vector3 angularVelocity_;
private:
- virtual bool isCollisionTypeLegal(WorldEntity::CollisionType type) const;
+ virtual bool isCollisionTypeLegal(WorldEntity::CollisionType type) const override;
};
}
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/MovableEntity.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/MovableEntity.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/MovableEntity.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -45,15 +45,15 @@
MovableEntity(Context* context);
virtual ~MovableEntity();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
using WorldEntity::setPosition;
using WorldEntity::setOrientation;
- inline void setPosition(const Vector3& position)
+ inline void setPosition(const Vector3& position) override
{ MobileEntity::setPosition(position); this->overwrite_position_ = this->getPosition(); }
- inline void setOrientation(const Quaternion& orientation)
+ 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);
- void clientDisconnected(unsigned int clientID);
+ void clientConnected(unsigned int clientID) override;
+ void clientDisconnected(unsigned int clientID) override;
void resynchronize();
inline void processLinearVelocity()
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/SpawnPoint.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/SpawnPoint.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/SpawnPoint.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -43,7 +43,7 @@
SpawnPoint(Context* context);
virtual ~SpawnPoint() {}
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
inline void setSpawnClass(Identifier* identifier)
{ this->spawnclass_ = identifier; this->spawnclassname_ = identifier->getName(); }
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/StaticEntity.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/StaticEntity.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/StaticEntity.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -54,12 +54,12 @@
using WorldEntity::setPosition;
using WorldEntity::setOrientation;
- void setPosition(const Vector3& position);
- void setOrientation(const Quaternion& orientation);
+ void setPosition(const Vector3& position) override;
+ void setOrientation(const Quaternion& orientation) override;
private:
void registerVariables();
- bool isCollisionTypeLegal(CollisionType type) const;
+ 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);
- void getWorldTransform(btTransform& worldTrans) const;
+ void setWorldTransform(const btTransform& worldTrans) override;
+ void getWorldTransform(btTransform& worldTrans) const override;
};
}
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/TeamSpawnPoint.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/TeamSpawnPoint.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/TeamSpawnPoint.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -42,7 +42,7 @@
TeamSpawnPoint(Context* context);
virtual ~TeamSpawnPoint() {}
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
void setTeamNumber(unsigned int team)
{ this->teamNumber_ = team; }
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -95,7 +95,7 @@
WorldEntity(Context* context);
virtual ~WorldEntity();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
inline const Ogre::SceneNode* getNode() const
{ return this->node_; }
@@ -107,8 +107,8 @@
static const Vector3 DOWN;
static const Vector3 UP;
- virtual void changedActivity(void);
- virtual void changedVisibility(void);
+ virtual void changedActivity(void) override;
+ virtual void changedVisibility(void) override;
virtual void setPosition(const Vector3& position) = 0;
inline void setPosition(float x, float y, float z)
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.h 2015-11-18 16:22:52 UTC (rev 10816)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.h 2015-11-19 10:40:28 UTC (rev 10817)
@@ -60,8 +60,8 @@
Pawn(Context* context);
virtual ~Pawn();
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void tick(float dt);
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+ virtual void tick(float dt) override;
inline bool isAlive() const
{ return this->bAlive_; }
@@ -142,8 +142,8 @@
virtual void kill();
- virtual void fired(unsigned int firemode);
- virtual void reload();
+ virtual void fired(unsigned int firemode) override;
+ virtual void reload() override;
virtual void postSpawn();
void addWeaponSlot(WeaponSlot * wSlot);
@@ -178,26 +178,26 @@
{ return this->damageMultiplier_; }
- virtual void startLocalHumanControl();
+ virtual void startLocalHumanControl() override;
void setAimPosition( Vector3 position )
{ this->aimPosition_ = position; }
Vector3 getAimPosition()
{ return this->aimPosition_; }
- virtual const Vector3& getCarrierPosition(void) const
+ virtual const Vector3& getCarrierPosition(void) const override
{ return this->getWorldPosition(); };
- virtual void changedVisibility();
+ virtual void changedVisibility() override;
void setExplosionSound(const std::string& engineSound);
const std::string& getExplosionSound();
protected:
- virtual void preDestroy();
+ virtual void preDestroy() override;
- virtual void setPlayer(PlayerInfo* player);
- virtual void removePlayer();
+ virtual void setPlayer(PlayerInfo* player) override;
+ virtual void removePlayer() override;
virtual void death();
virtual bool hasSlaves();
@@ -211,9 +211,9 @@
bool bAlive_;
- virtual std::vector<PickupCarrier*>* getCarrierChildren(void) const
+ virtual std::vector<PickupCarrier*>* getCarrierChildren(void) const override
{ return new std::vector<PickupCarrier*>(); }
- virtual PickupCarrier* getCarrierParent(void) const
+ virtual PickupCarrier* getCarrierParent(void) const override
{ return nullptr; }
More information about the Orxonox-commit
mailing list