Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3293


Ignore:
Timestamp:
Jul 14, 2009, 2:19:57 PM (15 years ago)
Author:
rgrieder
Message:

Linux and GCC build fixes.

Location:
code/branches/core4/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • code/branches/core4/src/core/OrxonoxClass.h

    r3274 r3293  
    3939
    4040#include "CorePrereqs.h"
     41
    4142#include <set>
    4243#include <vector>

  • code/branches/core4/src/core/input/JoyStickQuantityListener.h

    r3291 r3293  
    4343    class _CoreExport JoyStickQuantityListener : virtual public OrxonoxClass
    4444    {
    45         friend InputManager;
     45        friend class InputManager;
    4646    protected:
    4747        JoyStickQuantityListener();

  • code/branches/core4/src/core/input/Mouse.cc

    r3291 r3293  
    9393
    9494#ifdef ORXONOX_PLATFORM_LINUX
    95     void Mouse::grabMouse()
     95    void Mouse::grab()
    9696    {
    97         OIS::LinuxMouse* linuxMouse = dynamic_cast<OIS::LinuxMouse*>(instancePointer_s->oisDevice_);
     97        OIS::LinuxMouse* linuxMouse = dynamic_cast<OIS::LinuxMouse*>(oisDevice_);
    9898        assert(linuxMouse);
    9999        linuxMouse->grab(true);
    100100    }
    101101
    102     void Mouse::ungrabMouse()
     102    void Mouse::ungrab()
    103103    {
    104         OIS::LinuxMouse* linuxMouse = dynamic_cast<OIS::LinuxMouse*>(instancePointer_s->oisDevice_);
     104        OIS::LinuxMouse* linuxMouse = dynamic_cast<OIS::LinuxMouse*>(oisDevice_);
    105105        assert(linuxMouse);
    106106        linuxMouse->grab(false);

  • code/branches/core4/src/core/input/Mouse.h

    r3291 r3293  
    6868#ifdef ORXONOX_PLATFORM_LINUX
    6969        // TODO: Make this a feature rather than a hack
    70         void grabMouse();
    71         void ungrabMouse();
     70        void grab();
     71        void ungrab();
    7272#endif
    7373

  • code/branches/core4/src/orxonox/LevelManager.h

    r3249 r3293  
    3434#include <cassert>
    3535#include <list>
     36#include <string>
    3637#include "core/OrxonoxClass.h"
    3738

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

    r3274 r3293  
    6969            void logEvent(const CEGUI::String& message, CEGUI::LoggingLevel level = CEGUI::Standard)
    7070        {
    71             int orxonoxLevel;
     71            int orxonoxLevel = CEGUI::Standard;
    7272            switch (level)
    7373            {
Note: See TracChangeset for help on using the changeset viewer.