Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1819 for code/trunk


Ignore:
Timestamp:
Sep 22, 2008, 12:52:05 PM (16 years ago)
Author:
rgrieder
Message:

more fixes, sorry.

Location:
code/trunk/src/orxonox
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/orxonox/gamestates/GSLevel.cc

    r1790 r1819  
    3838#include "objects/Backlight.h"
    3939#include "objects/Tickable.h"
     40#include "objects/Radar.h"
    4041#include "tools/Timer.h"
    4142#include "tools/ParticleInterface.h"
    4243#include "Settings.h"
    43 #include "Radar.h"
    4444#include "GraphicsEngine.h"
    4545
  • code/trunk/src/orxonox/overlays/console/InGameConsole.cc

    r1784 r1819  
    104104            if (this->consoleOverlayCursor_)
    105105                Ogre::OverlayManager::getSingleton().destroyOverlayElement(this->consoleOverlayCursor_);
     106            Ogre::FontManager::getSingleton().remove("MonofurConsole");
    106107            if (this->consoleOverlayBorder_)
    107108                Ogre::OverlayManager::getSingleton().destroyOverlayElement(this->consoleOverlayBorder_);
     
    124125            this->consoleOverlayTextAreas_ = 0;
    125126        }
     127
     128        if (this->consoleOverlay_)
     129            Ogre::OverlayManager::getSingleton().destroy(consoleOverlay_);
    126130
    127131        singletonRef_s = 0;
  • code/trunk/src/orxonox/overlays/hud/HUDNavigation.cc

    r1747 r1819  
    4040#include "core/CoreIncludes.h"
    4141#include "core/XMLPort.h"
     42#include "objects/Radar.h"
    4243#include "objects/SpaceShip.h"
    4344#include "objects/Projectile.h"
    4445#include "objects/CameraHandler.h"
    45 #include "Radar.h"
    4646
    4747namespace orxonox
  • code/trunk/src/orxonox/overlays/hud/HUDRadar.cc

    r1782 r1819  
    4040#include "objects/SpaceShip.h"
    4141#include "objects/WorldEntity.h"
     42#include "objects/Radar.h"
    4243#include "tools/TextureGenerator.h"
    43 #include "Radar.h"
    4444
    4545namespace orxonox
  • code/trunk/src/orxonox/overlays/hud/HUDRadar.h

    r1747 r1819  
    3737#include <OgrePrerequisites.h>
    3838#include "overlays/OrxonoxOverlay.h"
    39 #include "RadarListener.h"
    40 #include "RadarViewable.h"
     39#include "objects/RadarListener.h"
     40#include "objects/RadarViewable.h"
    4141
    4242namespace orxonox
Note: See TracChangeset for help on using the changeset viewer.