[Orxonox-commit 650] r3182 - in branches/pch/src/orxonox: . gamestates interfaces objects objects/gametypes objects/pickup objects/quest objects/worldentities objects/worldentities/triggers overlays overlays/console
rgrieder at orxonox.net
rgrieder at orxonox.net
Mon Jun 15 21:50:37 CEST 2009
Author: rgrieder
Date: 2009-06-15 21:50:37 +0200 (Mon, 15 Jun 2009)
New Revision: 3182
Modified:
branches/pch/src/orxonox/GraphicsManager.cc
branches/pch/src/orxonox/gamestates/GSGraphics.cc
branches/pch/src/orxonox/gamestates/GSLevel.cc
branches/pch/src/orxonox/interfaces/RadarViewable.cc
branches/pch/src/orxonox/interfaces/RadarViewable.h
branches/pch/src/orxonox/objects/Script.cc
branches/pch/src/orxonox/objects/gametypes/Asteroids.cc
branches/pch/src/orxonox/objects/gametypes/Deathmatch.cc
branches/pch/src/orxonox/objects/gametypes/Gametype.cc
branches/pch/src/orxonox/objects/gametypes/TeamBaseMatch.cc
branches/pch/src/orxonox/objects/pickup/BaseItem.cc
branches/pch/src/orxonox/objects/pickup/DroppedItem.cc
branches/pch/src/orxonox/objects/pickup/ModifierPickup.cc
branches/pch/src/orxonox/objects/quest/AddQuest.cc
branches/pch/src/orxonox/objects/quest/AddReward.cc
branches/pch/src/orxonox/objects/worldentities/MobileEntity.cc
branches/pch/src/orxonox/objects/worldentities/triggers/Trigger.cc
branches/pch/src/orxonox/overlays/OverlayGroup.cc
branches/pch/src/orxonox/overlays/console/InGameConsole.cc
Log:
Found out that that Debug.h is officially included in CoreIncludes.h ;)
Modified: branches/pch/src/orxonox/GraphicsManager.cc
===================================================================
--- branches/pch/src/orxonox/GraphicsManager.cc 2009-06-15 19:40:19 UTC (rev 3181)
+++ branches/pch/src/orxonox/GraphicsManager.cc 2009-06-15 19:50:37 UTC (rev 3182)
@@ -51,7 +51,6 @@
#include <OgreWindowEventUtilities.h>
#include "SpecialConfig.h"
-#include "util/Debug.h"
#include "util/Exception.h"
#include "util/String.h"
#include "util/SubString.h"
Modified: branches/pch/src/orxonox/gamestates/GSGraphics.cc
===================================================================
--- branches/pch/src/orxonox/gamestates/GSGraphics.cc 2009-06-15 19:40:19 UTC (rev 3181)
+++ branches/pch/src/orxonox/gamestates/GSGraphics.cc 2009-06-15 19:50:37 UTC (rev 3182)
@@ -37,7 +37,6 @@
#include <boost/filesystem.hpp>
#include <OgreRenderWindow.h>
-#include "util/Debug.h"
#include "core/ConfigValueIncludes.h"
#include "core/Clock.h"
#include "core/ConsoleCommand.h"
Modified: branches/pch/src/orxonox/gamestates/GSLevel.cc
===================================================================
--- branches/pch/src/orxonox/gamestates/GSLevel.cc 2009-06-15 19:40:19 UTC (rev 3181)
+++ branches/pch/src/orxonox/gamestates/GSLevel.cc 2009-06-15 19:50:37 UTC (rev 3182)
@@ -29,7 +29,6 @@
#include "GSLevel.h"
-#include "util/Debug.h"
#include "core/input/InputManager.h"
#include "core/input/SimpleInputState.h"
#include "core/input/KeyBinder.h"
Modified: branches/pch/src/orxonox/interfaces/RadarViewable.cc
===================================================================
--- branches/pch/src/orxonox/interfaces/RadarViewable.cc 2009-06-15 19:40:19 UTC (rev 3181)
+++ branches/pch/src/orxonox/interfaces/RadarViewable.cc 2009-06-15 19:50:37 UTC (rev 3182)
@@ -32,7 +32,6 @@
#include <OgreSceneNode.h>
#include <OgreEntity.h>
-#include "util/Debug.h"
#include "util/String.h"
#include "core/CoreIncludes.h"
#include "tools/DynamicLines.h"
@@ -158,4 +157,13 @@
validate(object);
return object->getWorldOrientation() * object->getVelocity();
}
+
+ void RadarViewable::validate(const WorldEntity* object) const
+ {
+ if (!object)
+ {
+ COUT(1) << "Assertation: Every RadarViewable has to be assigned a WorldEntity pointer!" << std::endl;
+ assert(0);
+ }
+ }
}
Modified: branches/pch/src/orxonox/interfaces/RadarViewable.h
===================================================================
--- branches/pch/src/orxonox/interfaces/RadarViewable.h 2009-06-15 19:40:19 UTC (rev 3181)
+++ branches/pch/src/orxonox/interfaces/RadarViewable.h 2009-06-15 19:50:37 UTC (rev 3182)
@@ -36,7 +36,6 @@
#include <OgrePrerequisites.h>
#include "util/Math.h"
-#include "util/Debug.h"
#include "core/OrxonoxClass.h"
namespace orxonox
@@ -113,15 +112,7 @@
//friend class Map;
private:
- void validate(const WorldEntity* object) const
- {
- if (!object)
- {
- COUT(1) << "Assertation: Every RadarViewable has to be assigned a WorldEntity pointer!" << std::endl;
- assert(0);
- }
- }
-
+ void validate(const WorldEntity* object) const;
bool bVisibility_;
//Map
std::string uniqueId_;
Modified: branches/pch/src/orxonox/objects/Script.cc
===================================================================
--- branches/pch/src/orxonox/objects/Script.cc 2009-06-15 19:40:19 UTC (rev 3181)
+++ branches/pch/src/orxonox/objects/Script.cc 2009-06-15 19:50:37 UTC (rev 3182)
@@ -29,7 +29,6 @@
#include "Script.h"
#include <tinyxml/ticpp.h>
-#include "util/Debug.h"
#include "core/CoreIncludes.h"
#include "core/LuaBind.h"
Modified: branches/pch/src/orxonox/objects/gametypes/Asteroids.cc
===================================================================
--- branches/pch/src/orxonox/objects/gametypes/Asteroids.cc 2009-06-15 19:40:19 UTC (rev 3181)
+++ branches/pch/src/orxonox/objects/gametypes/Asteroids.cc 2009-06-15 19:50:37 UTC (rev 3182)
@@ -28,7 +28,6 @@
#include "Asteroids.h"
-#include "util/Debug.h"
#include "core/CoreIncludes.h"
#include "network/Host.h"
#include "objects/worldentities/pawns/Pawn.h"
Modified: branches/pch/src/orxonox/objects/gametypes/Deathmatch.cc
===================================================================
--- branches/pch/src/orxonox/objects/gametypes/Deathmatch.cc 2009-06-15 19:40:19 UTC (rev 3181)
+++ branches/pch/src/orxonox/objects/gametypes/Deathmatch.cc 2009-06-15 19:50:37 UTC (rev 3182)
@@ -28,7 +28,6 @@
#include "Deathmatch.h"
-#include "util/Debug.h"
#include "core/CoreIncludes.h"
#include "network/Host.h"
#include "objects/infos/PlayerInfo.h"
Modified: branches/pch/src/orxonox/objects/gametypes/Gametype.cc
===================================================================
--- branches/pch/src/orxonox/objects/gametypes/Gametype.cc 2009-06-15 19:40:19 UTC (rev 3181)
+++ branches/pch/src/orxonox/objects/gametypes/Gametype.cc 2009-06-15 19:50:37 UTC (rev 3182)
@@ -28,7 +28,6 @@
#include "Gametype.h"
-#include "util/Debug.h"
#include "util/Math.h"
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
Modified: branches/pch/src/orxonox/objects/gametypes/TeamBaseMatch.cc
===================================================================
--- branches/pch/src/orxonox/objects/gametypes/TeamBaseMatch.cc 2009-06-15 19:40:19 UTC (rev 3181)
+++ branches/pch/src/orxonox/objects/gametypes/TeamBaseMatch.cc 2009-06-15 19:50:37 UTC (rev 3182)
@@ -28,7 +28,6 @@
#include "TeamBaseMatch.h"
-#include "util/Debug.h"
#include "core/CoreIncludes.h"
#include "core/Executor.h"
#include "objects/worldentities/pawns/TeamBaseMatchBase.h"
Modified: branches/pch/src/orxonox/objects/pickup/BaseItem.cc
===================================================================
--- branches/pch/src/orxonox/objects/pickup/BaseItem.cc 2009-06-15 19:40:19 UTC (rev 3181)
+++ branches/pch/src/orxonox/objects/pickup/BaseItem.cc 2009-06-15 19:50:37 UTC (rev 3182)
@@ -33,7 +33,6 @@
#include "BaseItem.h"
-#include "util/Debug.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "objects/worldentities/pawns/Pawn.h"
Modified: branches/pch/src/orxonox/objects/pickup/DroppedItem.cc
===================================================================
--- branches/pch/src/orxonox/objects/pickup/DroppedItem.cc 2009-06-15 19:40:19 UTC (rev 3181)
+++ branches/pch/src/orxonox/objects/pickup/DroppedItem.cc 2009-06-15 19:50:37 UTC (rev 3182)
@@ -28,7 +28,6 @@
#include "DroppedItem.h"
-#include "util/Debug.h"
#include "util/Math.h"
#include "core/CoreIncludes.h"
#include "core/Executor.h"
Modified: branches/pch/src/orxonox/objects/pickup/ModifierPickup.cc
===================================================================
--- branches/pch/src/orxonox/objects/pickup/ModifierPickup.cc 2009-06-15 19:40:19 UTC (rev 3181)
+++ branches/pch/src/orxonox/objects/pickup/ModifierPickup.cc 2009-06-15 19:50:37 UTC (rev 3182)
@@ -33,7 +33,6 @@
#include "ModifierPickup.h"
-#include "util/Debug.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "objects/worldentities/pawns/Pawn.h"
Modified: branches/pch/src/orxonox/objects/quest/AddQuest.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/AddQuest.cc 2009-06-15 19:40:19 UTC (rev 3181)
+++ branches/pch/src/orxonox/objects/quest/AddQuest.cc 2009-06-15 19:50:37 UTC (rev 3182)
@@ -33,7 +33,6 @@
#include "AddQuest.h"
-#include "util/Debug.h"
#include "util/Exception.h"
#include "core/CoreIncludes.h"
#include "QuestManager.h"
Modified: branches/pch/src/orxonox/objects/quest/AddReward.cc
===================================================================
--- branches/pch/src/orxonox/objects/quest/AddReward.cc 2009-06-15 19:40:19 UTC (rev 3181)
+++ branches/pch/src/orxonox/objects/quest/AddReward.cc 2009-06-15 19:50:37 UTC (rev 3182)
@@ -33,7 +33,6 @@
#include "AddReward.h"
-#include "util/Debug.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "Rewardable.h"
Modified: branches/pch/src/orxonox/objects/worldentities/MobileEntity.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/MobileEntity.cc 2009-06-15 19:40:19 UTC (rev 3181)
+++ branches/pch/src/orxonox/objects/worldentities/MobileEntity.cc 2009-06-15 19:50:37 UTC (rev 3182)
@@ -31,7 +31,6 @@
#include <OgreSceneNode.h>
#include <BulletDynamics/Dynamics/btRigidBody.h>
-#include "util/Debug.h"
#include "util/MathConvert.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
Modified: branches/pch/src/orxonox/objects/worldentities/triggers/Trigger.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/triggers/Trigger.cc 2009-06-15 19:40:19 UTC (rev 3181)
+++ branches/pch/src/orxonox/objects/worldentities/triggers/Trigger.cc 2009-06-15 19:50:37 UTC (rev 3182)
@@ -30,7 +30,6 @@
#include <OgreBillboard.h>
#include <OgreBillboardSet.h>
-#include "util/Debug.h"
#include "core/CoreIncludes.h"
#include "core/ConsoleCommand.h"
#include "core/XMLPort.h"
Modified: branches/pch/src/orxonox/overlays/OverlayGroup.cc
===================================================================
--- branches/pch/src/orxonox/overlays/OverlayGroup.cc 2009-06-15 19:40:19 UTC (rev 3181)
+++ branches/pch/src/orxonox/overlays/OverlayGroup.cc 2009-06-15 19:50:37 UTC (rev 3182)
@@ -33,7 +33,6 @@
#include "OverlayGroup.h"
-#include "util/Debug.h"
#include "core/ConsoleCommand.h"
#include "core/CoreIncludes.h"
#include "core/ObjectList.h"
Modified: branches/pch/src/orxonox/overlays/console/InGameConsole.cc
===================================================================
--- branches/pch/src/orxonox/overlays/console/InGameConsole.cc 2009-06-15 19:40:19 UTC (rev 3181)
+++ branches/pch/src/orxonox/overlays/console/InGameConsole.cc 2009-06-15 19:50:37 UTC (rev 3182)
@@ -41,7 +41,6 @@
#include "util/Math.h"
#include "util/Convert.h"
-#include "util/Debug.h"
#include "util/UTFStringConversions.h"
#include "core/Clock.h"
#include "core/CoreIncludes.h"
More information about the Orxonox-commit
mailing list