Changeset 1819 for code/trunk

Timestamp:

Sep 22, 2008, 12:52:05 PM (16 years ago)

Author:

rgrieder

Message:

more fixes, sorry.

Location:

code/trunk/src/orxonox

Files:

• gamestates/GSLevel.cc (modified) (1 diff)
• overlays/console/InGameConsole.cc (modified) (2 diffs)
• overlays/hud/HUDNavigation.cc (modified) (1 diff)
• overlays/hud/HUDRadar.cc (modified) (1 diff)
• overlays/hud/HUDRadar.h (modified) (1 diff)

code/trunk/src/orxonox/gamestates/GSLevel.cc

@@ -38 +38 @@
 #include "objects/Backlight.h"
 #include "objects/Tickable.h"
+#include "objects/Radar.h"
 #include "tools/Timer.h"
 #include "tools/ParticleInterface.h"
 #include "Settings.h"
-#include "Radar.h"
 #include "GraphicsEngine.h"
 

code/trunk/src/orxonox/overlays/console/InGameConsole.cc

@@ -104 +104 @@
             if (this->consoleOverlayCursor_)
                 Ogre::OverlayManager::getSingleton().destroyOverlayElement(this->consoleOverlayCursor_);
+            Ogre::FontManager::getSingleton().remove("MonofurConsole");
             if (this->consoleOverlayBorder_)
                 Ogre::OverlayManager::getSingleton().destroyOverlayElement(this->consoleOverlayBorder_);
@@ -124 +125 @@
             this->consoleOverlayTextAreas_ = 0;
         }
+
+        if (this->consoleOverlay_)
+            Ogre::OverlayManager::getSingleton().destroy(consoleOverlay_);
 
         singletonRef_s = 0;

code/trunk/src/orxonox/overlays/hud/HUDNavigation.cc

@@ -40 +40 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "objects/Radar.h"
 #include "objects/SpaceShip.h"
 #include "objects/Projectile.h"
 #include "objects/CameraHandler.h"
-#include "Radar.h"
 
 namespace orxonox

code/trunk/src/orxonox/overlays/hud/HUDRadar.cc

@@ -40 +40 @@
 #include "objects/SpaceShip.h"
 #include "objects/WorldEntity.h"
+#include "objects/Radar.h"
 #include "tools/TextureGenerator.h"
-#include "Radar.h"
 
 namespace orxonox

code/trunk/src/orxonox/overlays/hud/HUDRadar.h

@@ -37 +37 @@
 #include <OgrePrerequisites.h>
 #include "overlays/OrxonoxOverlay.h"
-#include "RadarListener.h"
-#include "RadarViewable.h"
+#include "objects/RadarListener.h"
+#include "objects/RadarViewable.h"
 
 namespace orxonox