[Orxonox-commit 765] r3293 - in branches/core4/src: core core/input orxonox orxonox/gui

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-07-14 14:19:57 +0200 (Tue, 14 Jul 2009)
New Revision: 3293

Modified:
   branches/core4/src/core/OrxonoxClass.h
   branches/core4/src/core/input/JoyStickQuantityListener.h
   branches/core4/src/core/input/Mouse.cc
   branches/core4/src/core/input/Mouse.h
   branches/core4/src/orxonox/LevelManager.h
   branches/core4/src/orxonox/gui/GUIManager.cc
Log:
Linux and GCC build fixes.

Modified: branches/core4/src/core/OrxonoxClass.h
===================================================================
--- branches/core4/src/core/OrxonoxClass.h	2009-07-14 11:59:39 UTC (rev 3292)
+++ branches/core4/src/core/OrxonoxClass.h	2009-07-14 12:19:57 UTC (rev 3293)
@@ -38,6 +38,7 @@
 #define _OrxonoxClass_H__
 
 #include "CorePrereqs.h"
+
 #include <set>
 #include <vector>
 

Modified: branches/core4/src/core/input/JoyStickQuantityListener.h
===================================================================
--- branches/core4/src/core/input/JoyStickQuantityListener.h	2009-07-14 11:59:39 UTC (rev 3292)
+++ branches/core4/src/core/input/JoyStickQuantityListener.h	2009-07-14 12:19:57 UTC (rev 3293)
@@ -42,7 +42,7 @@
     //! Derive from this class to get informed when joy sticks get added/removed
     class _CoreExport JoyStickQuantityListener : virtual public OrxonoxClass
     {
-        friend InputManager;
+        friend class InputManager;
     protected:
         JoyStickQuantityListener();
         virtual ~JoyStickQuantityListener() { }

Modified: branches/core4/src/core/input/Mouse.cc
===================================================================
--- branches/core4/src/core/input/Mouse.cc	2009-07-14 11:59:39 UTC (rev 3292)
+++ branches/core4/src/core/input/Mouse.cc	2009-07-14 12:19:57 UTC (rev 3293)
@@ -92,16 +92,16 @@
     }
 
 #ifdef ORXONOX_PLATFORM_LINUX
-    void Mouse::grabMouse()
+    void Mouse::grab()
     {
-        OIS::LinuxMouse* linuxMouse = dynamic_cast<OIS::LinuxMouse*>(instancePointer_s->oisDevice_);
+        OIS::LinuxMouse* linuxMouse = dynamic_cast<OIS::LinuxMouse*>(oisDevice_);
         assert(linuxMouse);
         linuxMouse->grab(true);
     }
 
-    void Mouse::ungrabMouse()
+    void Mouse::ungrab()
     {
-        OIS::LinuxMouse* linuxMouse = dynamic_cast<OIS::LinuxMouse*>(instancePointer_s->oisDevice_);
+        OIS::LinuxMouse* linuxMouse = dynamic_cast<OIS::LinuxMouse*>(oisDevice_);
         assert(linuxMouse);
         linuxMouse->grab(false);
     }

Modified: branches/core4/src/core/input/Mouse.h
===================================================================
--- branches/core4/src/core/input/Mouse.h	2009-07-14 11:59:39 UTC (rev 3292)
+++ branches/core4/src/core/input/Mouse.h	2009-07-14 12:19:57 UTC (rev 3293)
@@ -67,8 +67,8 @@
 
 #ifdef ORXONOX_PLATFORM_LINUX
         // TODO: Make this a feature rather than a hack
-        void grabMouse();
-        void ungrabMouse();
+        void grab();
+        void ungrab();
 #endif
 
     private:

Modified: branches/core4/src/orxonox/LevelManager.h
===================================================================
--- branches/core4/src/orxonox/LevelManager.h	2009-07-14 11:59:39 UTC (rev 3292)
+++ branches/core4/src/orxonox/LevelManager.h	2009-07-14 12:19:57 UTC (rev 3293)
@@ -33,6 +33,7 @@
 
 #include <cassert>
 #include <list>
+#include <string>
 #include "core/OrxonoxClass.h"
 
 // tolua_begin

Modified: branches/core4/src/orxonox/gui/GUIManager.cc
===================================================================
--- branches/core4/src/orxonox/gui/GUIManager.cc	2009-07-14 11:59:39 UTC (rev 3292)
+++ branches/core4/src/orxonox/gui/GUIManager.cc	2009-07-14 12:19:57 UTC (rev 3293)
@@ -68,7 +68,7 @@
     public:
 	    void logEvent(const CEGUI::String& message, CEGUI::LoggingLevel level = CEGUI::Standard)
         {
-            int orxonoxLevel;
+            int orxonoxLevel = CEGUI::Standard;
             switch (level)
             {
                 case CEGUI::Errors:      orxonoxLevel = 1; break;