[Orxonox-commit 178] r2853 - in branches/gui: cmake src/core src/network/packet src/orxonox/gamestates src/orxonox/gui

[bknecht at orxonox.net]

Author: bknecht
Date: 2009-03-26 14:18:08 +0000 (Thu, 26 Mar 2009)
New Revision: 2853

Modified:
   branches/gui/cmake/BuildConfig.cmake
   branches/gui/src/core/Game.h
   branches/gui/src/network/packet/Gamestate.h
   branches/gui/src/orxonox/gamestates/GSMainMenu.cc
   branches/gui/src/orxonox/gui/GUIManager.cc
   branches/gui/src/orxonox/gui/GUIManager.h
Log:
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.

Modified: branches/gui/cmake/BuildConfig.cmake
===================================================================
--- branches/gui/cmake/BuildConfig.cmake	2009-03-26 13:56:39 UTC (rev 2852)
+++ branches/gui/cmake/BuildConfig.cmake	2009-03-26 14:18:08 UTC (rev 2853)
@@ -89,7 +89,7 @@
 
 ################ 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)
 
@@ -183,6 +183,7 @@
 
 # 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
 ADD_COMPILER_FLAGS("-DBOOST_ALL_DYN_LINK" WIN32 LINK_BOOST_DYNAMIC)

Modified: branches/gui/src/core/Game.h
===================================================================
--- branches/gui/src/core/Game.h	2009-03-26 13:56:39 UTC (rev 2852)
+++ branches/gui/src/core/Game.h	2009-03-26 14:18:08 UTC (rev 2853)
@@ -42,8 +42,8 @@
 #include <vector>
 #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
 {

Modified: branches/gui/src/network/packet/Gamestate.h
===================================================================
--- branches/gui/src/network/packet/Gamestate.h	2009-03-26 13:56:39 UTC (rev 2852)
+++ branches/gui/src/network/packet/Gamestate.h	2009-03-26 14:18:08 UTC (rev 2853)
@@ -34,6 +34,7 @@
 
 #include "Packet.h"
 #include "network/TrafficControl.h"
+#include <string.h>
 #include <map>
 #include <list>
 #include <cassert>

Modified: branches/gui/src/orxonox/gamestates/GSMainMenu.cc
===================================================================
--- branches/gui/src/orxonox/gamestates/GSMainMenu.cc	2009-03-26 13:56:39 UTC (rev 2852)
+++ branches/gui/src/orxonox/gamestates/GSMainMenu.cc	2009-03-26 14:18:08 UTC (rev 2853)
@@ -66,7 +66,7 @@
         this->camera_ = this->scene_->getSceneManager()->createCamera("mainMenu/Camera");
 
         // show main menu
-        GUIManager::getInstance().showGUI("mainMenu");
+        GUIManager::getInstance().showGUI("mainmenu");
         GUIManager::getInstance().setCamera(this->camera_);
         GraphicsManager::getInstance().setCamera(this->camera_);
 
@@ -76,7 +76,7 @@
             this->ccStartGame_ = createConsoleCommand(functor, "startGame");
             CommandExecutor::addConsoleCommandShortcut(this->ccStartGame_);
         }
-        
+
         InputManager::getInstance().requestEnterState("mainMenu");
     }
 

Modified: branches/gui/src/orxonox/gui/GUIManager.cc
===================================================================
--- branches/gui/src/orxonox/gui/GUIManager.cc	2009-03-26 13:56:39 UTC (rev 2852)
+++ branches/gui/src/orxonox/gui/GUIManager.cc	2009-03-26 14:18:08 UTC (rev 2853)
@@ -185,6 +185,11 @@
         this->guiRenderer_->setTargetSceneManager(camera->getSceneManager());
     }
 
+    void GUIManager::testOutput(std::string& str)
+    {
+        COUT(0) << "*** CEGUI: " << str << std::endl;
+    }
+
     void GUIManager::showGUI(const std::string& name)
     {
         if (state_ != Uninitialised)

Modified: branches/gui/src/orxonox/gui/GUIManager.h
===================================================================
--- branches/gui/src/orxonox/gui/GUIManager.h	2009-03-26 13:56:39 UTC (rev 2852)
+++ branches/gui/src/orxonox/gui/GUIManager.h	2009-03-26 14:18:08 UTC (rev 2853)
@@ -77,6 +77,8 @@
 
         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; }