Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3157 for code/branches


Ignore:
Timestamp:
Jun 13, 2009, 5:03:51 PM (15 years ago)
Author:
rgrieder
Message:

Small changes and cleaned out RadarViewable which saves me probably more than a minute when recompiling…

Location:
code/branches/pch/src/orxonox
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • code/branches/pch/src/orxonox/gamestates/GSDedicated.cc

    r3110 r3157  
    3333#include "core/Game.h"
    3434#include "core/GameMode.h"
    35 #include "core/Iterator.h"
     35#include "core/ObjectList.h"
    3636#include "network/Server.h"
    3737#include "objects/Tickable.h"
  • code/branches/pch/src/orxonox/objects/RadarViewable.cc

    r3130 r3157  
    3030
    3131#include <OgreSceneManager.h>
     32#include <OgreSceneNode.h>
     33#include <OgreEntity.h>
     34#include <OgreManualObject.h>
     35
    3236#include "util/Debug.h"
    33 #include "util/Exception.h"
     37#include "util/String.h"
    3438#include "core/CoreIncludes.h"
     39#include "orxonox/tools/DynamicLines.h"
    3540#include "objects/worldentities/WorldEntity.h"
    3641#include "objects/Radar.h"
    37 #include "util/String.h"
    38 #include <OgreManualObject.h>
    3942#include "overlays/map/Map.h"
    40 #include "orxonox/tools/DynamicLines.h"
    4143
    4244namespace orxonox
  • code/branches/pch/src/orxonox/objects/RadarViewable.h

    r3130 r3157  
    3131
    3232#include "OrxonoxPrereqs.h"
     33
    3334#include <string>
    3435#include <cassert>
     36
    3537#include "util/Math.h"
    3638#include "util/Debug.h"
    3739#include "core/OrxonoxClass.h"
    38 
    39 #include <string>
    40 #include <OgreSceneNode.h>
    41 #include <OgreEntity.h>
    42 #include <OgreManualObject.h>
    43 #include "orxonox/tools/DynamicLines.h"
    4440
    4541namespace orxonox
     
    110106        void updateMapPosition();
    111107        bool isHumanShip_;
    112         inline std::string getUniqueId()
     108        inline const std::string& getUniqueId()
    113109        {
    114110            return this->uniqueId_;
  • code/branches/pch/src/orxonox/objects/pickup/PickupInventory.cc

    r3085 r3157  
    8686    {
    8787        if(PickupInventory::getSingleton()->isVisible()) {
    88             GUIManager::getInstancePtr()->executeCode("hideGUI(\"PickupInventory\")");
    89             GUIManager::getInstancePtr()->executeCode("hideCursor()");
     88            GUIManager::getInstance().executeCode("hideGUI(\"PickupInventory\")");
     89            GUIManager::getInstance().executeCode("hideCursor()");
    9090            InputManager::getInstance().requestLeaveState("guiMouseOnly");
    9191        }
    9292        else
    9393        {
    94             GUIManager::getInstancePtr()->showGUI("PickupInventory");
    95             GUIManager::getInstancePtr()->executeCode("showCursor()");
     94            GUIManager::getInstance().showGUI("PickupInventory");
     95            GUIManager::getInstance().executeCode("showCursor()");
    9696            InputManager::getInstance().requestEnterState("guiMouseOnly");
    9797        }
  • code/branches/pch/src/orxonox/objects/pickup/PickupSpawner.cc

    r3079 r3157  
    9595        //  & load the GUI itself too, along with some empty windows
    9696        //   = even less delays
    97         GUIManager::getInstancePtr()->showGUI("PickupInventory");
    98         GUIManager::getInstancePtr()->executeCode("hideGUI(\"PickupInventory\")");
     97        GUIManager::getInstance().showGUI("PickupInventory");
     98        GUIManager::getInstance().executeCode("hideGUI(\"PickupInventory\")");
    9999        PickupInventory::getSingleton();
    100100    }
  • code/branches/pch/src/orxonox/sound/CMakeLists.txt

    r3078 r3157  
    11ADD_SOURCE_FILES(ORXONOX_SRC_FILES
    2     SoundManager.h
    3     SoundBase.h
    4     SoundMainMenu.h
    5 
    62    SoundManager.cc
    73    SoundBase.cc
  • code/branches/pch/src/orxonox/sound/SoundBase.cc

    r3139 r3157  
    2929#include "SoundBase.h"
    3030
     31#include <string>
    3132#include <vector>
    3233#include <AL/alut.h>
     
    181182    }
    182183
    183     ALuint SoundBase::loadOggFile(std::string filename)
     184    ALuint SoundBase::loadOggFile(const std::string& filename)
    184185    {
    185186        char inbuffer[4096];
  • code/branches/pch/src/orxonox/sound/SoundBase.h

    r3156 r3157  
    5757
    5858    private:
    59         ALuint loadOggFile(std::string filename);
     59        ALuint loadOggFile(const std::string& filename);
    6060        ALuint source_;
    6161        ALuint buffer_;
Note: See TracChangeset for help on using the changeset viewer.