Changeset 1535 for code/trunk/src/orxonox/hud

Timestamp:

Jun 4, 2008, 8:54:43 PM (16 years ago)

Author:

rgrieder

Message:

merged input branch back to trunk

Location:

code/trunk/src/orxonox/hud

Files:

• HUD.h (modified) (1 diff)
• RadarOverlayElement.cc (modified) (1 diff)

code/trunk/src/orxonox/hud/HUD.h

@@ -36 +36 @@
 #include <OgreTextAreaOverlayElement.h>
 #include <OgreSceneNode.h>
-#include "core/Tickable.h"
+#include "objects/Tickable.h"
 #include "util/Math.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport HUD : public Tickable
+    class _OrxonoxExport HUD : public TickableReal
     {
       private:

code/trunk/src/orxonox/hud/RadarOverlayElement.cc

@@ -35 +35 @@
 
 #include "GraphicsEngine.h"
-#include "core/Tickable.h"
 #include "core/ConsoleCommand.h"
+#include "objects/Tickable.h"
 #include "objects/SpaceShip.h"
 #include "RadarObject.h"