Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2853


Ignore:
Timestamp:
Mar 26, 2009, 3:18:08 PM (15 years ago)
Author:
bknecht
Message:

Fixed some bugs. Please do not break the code, when working with other people on one branch. Also check if the game runs and not just compiles.

Location:
code/branches/gui
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • code/branches/gui/cmake/BuildConfig.cmake

    r2748 r2853  
    9090################ Compiler Config ################
    9191
    92 OPTION(EXTRA_COMPILER_WARNINGS "Enable some extra warnings (heavily pollutes the output)")
     92#OPTION(EXTRA_COMPILER_WARNINGS "Enable some extra warnings (heavily pollutes the output)")
    9393
    9494INCLUDE(FlagUtilities)
     
    184184# Disable Boost auto linking completely
    185185ADD_COMPILER_FLAGS("-DBOOST_ALL_NO_LIB")
     186ADD_COMPILER_FLAGS("-Wno-deprecated")
    186187
    187188# If no defines are specified, these libs get linked statically
  • code/branches/gui/src/core/Game.h

    r2850 r2853  
    4343#include "OrxonoxClass.h"
    4444
    45 #define AddGameState(classname, name, ...) \
    46     static bool bGameStateDummy_##classname##__LINE__ = orxonox::Game::addGameState(new classname(name, __VA_ARGS__))
     45#define AddGameState(classname, name) \
     46    static bool bGameStateDummy_##classname##__LINE__ = orxonox::Game::addGameState(new classname(name))
    4747
    4848namespace orxonox
  • code/branches/gui/src/network/packet/Gamestate.h

    r2842 r2853  
    3535#include "Packet.h"
    3636#include "network/TrafficControl.h"
     37#include <string.h>
    3738#include <map>
    3839#include <list>
  • code/branches/gui/src/orxonox/gamestates/GSMainMenu.cc

    r2850 r2853  
    6767
    6868        // show main menu
    69         GUIManager::getInstance().showGUI("mainMenu");
     69        GUIManager::getInstance().showGUI("mainmenu");
    7070        GUIManager::getInstance().setCamera(this->camera_);
    7171        GraphicsManager::getInstance().setCamera(this->camera_);
     
    7777            CommandExecutor::addConsoleCommandShortcut(this->ccStartGame_);
    7878        }
    79        
     79
    8080        InputManager::getInstance().requestEnterState("mainMenu");
    8181    }
  • code/branches/gui/src/orxonox/gui/GUIManager.cc

    r2850 r2853  
    186186    }
    187187
     188    void GUIManager::testOutput(std::string& str)
     189    {
     190        COUT(0) << "*** CEGUI: " << str << std::endl;
     191    }
     192
    188193    void GUIManager::showGUI(const std::string& name)
    189194    {
  • code/branches/gui/src/orxonox/gui/GUIManager.h

    r2850 r2853  
    7878        void setCamera(Ogre::Camera* camera);
    7979
     80        void testOutput(std::string& str); // tolua_export
     81
    8082        static GUIManager& getInstance()    { assert(singletonRef_s); return *singletonRef_s; } // tolua_export
    8183        static GUIManager* getInstancePtr() { return singletonRef_s; }
Note: See TracChangeset for help on using the changeset viewer.