Changeset 2853

Timestamp:

Mar 26, 2009, 3:18:08 PM (16 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:

• cmake/BuildConfig.cmake (modified) (2 diffs)
• src/core/Game.h (modified) (1 diff)
• src/network/packet/Gamestate.h (modified) (1 diff)
• src/orxonox/gamestates/GSMainMenu.cc (modified) (2 diffs)
• src/orxonox/gui/GUIManager.cc (modified) (1 diff)
• src/orxonox/gui/GUIManager.h (modified) (1 diff)

code/branches/gui/cmake/BuildConfig.cmake

@@ -90 +90 @@
 ################ Compiler Config ################
 
-OPTION(EXTRA_COMPILER_WARNINGS "Enable some extra warnings (heavily pollutes the output)")
+#OPTION(EXTRA_COMPILER_WARNINGS "Enable some extra warnings (heavily pollutes the output)")
 
 INCLUDE(FlagUtilities)
@@ -184 +184 @@
 # Disable Boost auto linking completely
 ADD_COMPILER_FLAGS("-DBOOST_ALL_NO_LIB")
+ADD_COMPILER_FLAGS("-Wno-deprecated")
 
 # If no defines are specified, these libs get linked statically

code/branches/gui/src/core/Game.h

@@ -43 +43 @@
 #include "OrxonoxClass.h"
 
-#define AddGameState(classname, name, ...) \
-    static bool bGameStateDummy_##classname##__LINE__ = orxonox::Game::addGameState(new classname(name, __VA_ARGS__))
+#define AddGameState(classname, name) \
+    static bool bGameStateDummy_##classname##__LINE__ = orxonox::Game::addGameState(new classname(name))
 
 namespace orxonox

code/branches/gui/src/network/packet/Gamestate.h

@@ -35 +35 @@
 #include "Packet.h"
 #include "network/TrafficControl.h"
+#include <string.h>
 #include <map>
 #include <list>

code/branches/gui/src/orxonox/gamestates/GSMainMenu.cc

@@ -67 +67 @@
 
         // show main menu
-        GUIManager::getInstance().showGUI("mainMenu");
+        GUIManager::getInstance().showGUI("mainmenu");
         GUIManager::getInstance().setCamera(this->camera_);
         GraphicsManager::getInstance().setCamera(this->camera_);
@@ -77 +77 @@
             CommandExecutor::addConsoleCommandShortcut(this->ccStartGame_);
         }
-        
+
         InputManager::getInstance().requestEnterState("mainMenu");
     }

code/branches/gui/src/orxonox/gui/GUIManager.cc

@@ -186 +186 @@
     }
 
+    void GUIManager::testOutput(std::string& str)
+    {
+        COUT(0) << "*** CEGUI: " << str << std::endl;
+    }
+
     void GUIManager::showGUI(const std::string& name)
     {

code/branches/gui/src/orxonox/gui/GUIManager.h

@@ -78 +78 @@
         void setCamera(Ogre::Camera* camera);
 
+        void testOutput(std::string& str); // tolua_export
+
         static GUIManager& getInstance()    { assert(singletonRef_s); return *singletonRef_s; } // tolua_export
         static GUIManager* getInstancePtr() { return singletonRef_s; }