Changeset 3182 for code/branches

Timestamp:

Jun 15, 2009, 9:50:37 PM (15 years ago)

Author:

rgrieder

Message:

Found out that that Debug.h is officially included in CoreIncludes.h

Location:

code/branches/pch/src/orxonox

Files:

• GraphicsManager.cc (modified) (1 diff)
• gamestates/GSGraphics.cc (modified) (1 diff)
• gamestates/GSLevel.cc (modified) (1 diff)
• interfaces/RadarViewable.cc (modified) (2 diffs)
• interfaces/RadarViewable.h (modified) (2 diffs)
• objects/Script.cc (modified) (1 diff)
• objects/gametypes/Asteroids.cc (modified) (1 diff)
• objects/gametypes/Deathmatch.cc (modified) (1 diff)
• objects/gametypes/Gametype.cc (modified) (1 diff)
• objects/gametypes/TeamBaseMatch.cc (modified) (1 diff)
• objects/pickup/BaseItem.cc (modified) (1 diff)
• objects/pickup/DroppedItem.cc (modified) (1 diff)
• objects/pickup/ModifierPickup.cc (modified) (1 diff)
• objects/quest/AddQuest.cc (modified) (1 diff)
• objects/quest/AddReward.cc (modified) (1 diff)
• objects/worldentities/MobileEntity.cc (modified) (1 diff)
• objects/worldentities/triggers/Trigger.cc (modified) (1 diff)
• overlays/OverlayGroup.cc (modified) (1 diff)
• overlays/console/InGameConsole.cc (modified) (1 diff)

code/branches/pch/src/orxonox/GraphicsManager.cc

@@ -52 +52 @@
 
 #include "SpecialConfig.h"
-#include "util/Debug.h"
 #include "util/Exception.h"
 #include "util/String.h"

code/branches/pch/src/orxonox/gamestates/GSGraphics.cc

@@ -38 +38 @@
 #include <OgreRenderWindow.h>
 
-#include "util/Debug.h"
 #include "core/ConfigValueIncludes.h"
 #include "core/Clock.h"

code/branches/pch/src/orxonox/gamestates/GSLevel.cc

@@ -30 +30 @@
 #include "GSLevel.h"
 
-#include "util/Debug.h"
 #include "core/input/InputManager.h"
 #include "core/input/SimpleInputState.h"

code/branches/pch/src/orxonox/interfaces/RadarViewable.cc

@@ -33 +33 @@
 #include <OgreEntity.h>
 
-#include "util/Debug.h"
 #include "util/String.h"
 #include "core/CoreIncludes.h"
@@ -159 +158 @@
         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);
+        }
+    }
 }

code/branches/pch/src/orxonox/interfaces/RadarViewable.h

@@ -37 +37 @@
 
 #include "util/Math.h"
-#include "util/Debug.h"
 #include "core/OrxonoxClass.h"
 
@@ -114 +113 @@
 
     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

code/branches/pch/src/orxonox/objects/Script.cc

@@ -30 +30 @@
 
 #include <tinyxml/ticpp.h>
-#include "util/Debug.h"
 #include "core/CoreIncludes.h"
 #include "core/LuaBind.h"

code/branches/pch/src/orxonox/objects/gametypes/Asteroids.cc

@@ -29 +29 @@
 #include "Asteroids.h"
 
-#include "util/Debug.h"
 #include "core/CoreIncludes.h"
 #include "network/Host.h"

code/branches/pch/src/orxonox/objects/gametypes/Deathmatch.cc

@@ -29 +29 @@
 #include "Deathmatch.h"
 
-#include "util/Debug.h"
 #include "core/CoreIncludes.h"
 #include "network/Host.h"

code/branches/pch/src/orxonox/objects/gametypes/Gametype.cc

@@ -29 +29 @@
 #include "Gametype.h"
 
-#include "util/Debug.h"
 #include "util/Math.h"
 #include "core/CoreIncludes.h"

code/branches/pch/src/orxonox/objects/gametypes/TeamBaseMatch.cc

@@ -29 +29 @@
 #include "TeamBaseMatch.h"
 
-#include "util/Debug.h"
 #include "core/CoreIncludes.h"
 #include "core/Executor.h"

code/branches/pch/src/orxonox/objects/pickup/BaseItem.cc

@@ -34 +34 @@
 #include "BaseItem.h"
 
-#include "util/Debug.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"

code/branches/pch/src/orxonox/objects/pickup/DroppedItem.cc

@@ -29 +29 @@
 #include "DroppedItem.h"
 
-#include "util/Debug.h"
 #include "util/Math.h"
 #include "core/CoreIncludes.h"

code/branches/pch/src/orxonox/objects/pickup/ModifierPickup.cc

@@ -34 +34 @@
 #include "ModifierPickup.h"
 
-#include "util/Debug.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"

code/branches/pch/src/orxonox/objects/quest/AddQuest.cc

@@ -34 +34 @@
 #include "AddQuest.h"
 
-#include "util/Debug.h"
 #include "util/Exception.h"
 #include "core/CoreIncludes.h"

code/branches/pch/src/orxonox/objects/quest/AddReward.cc

@@ -34 +34 @@
 #include "AddReward.h"
 
-#include "util/Debug.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"

code/branches/pch/src/orxonox/objects/worldentities/MobileEntity.cc

@@ -32 +32 @@
 #include <BulletDynamics/Dynamics/btRigidBody.h>
 
-#include "util/Debug.h"
 #include "util/MathConvert.h"
 #include "core/CoreIncludes.h"

code/branches/pch/src/orxonox/objects/worldentities/triggers/Trigger.cc

@@ -31 +31 @@
 #include <OgreBillboard.h>
 #include <OgreBillboardSet.h>
-#include "util/Debug.h"
 #include "core/CoreIncludes.h"
 #include "core/ConsoleCommand.h"

code/branches/pch/src/orxonox/overlays/OverlayGroup.cc

@@ -34 +34 @@
 #include "OverlayGroup.h"
 
-#include "util/Debug.h"
 #include "core/ConsoleCommand.h"
 #include "core/CoreIncludes.h"

code/branches/pch/src/orxonox/overlays/console/InGameConsole.cc

@@ -42 +42 @@
 #include "util/Math.h"
 #include "util/Convert.h"
-#include "util/Debug.h"
 #include "util/UTFStringConversions.h"
 #include "core/Clock.h"