Changeset 3293 for code/branches
- Timestamp:
- Jul 14, 2009, 2:19:57 PM (15 years ago)
- Location:
- code/branches/core4/src
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/core4/src/core/OrxonoxClass.h
r3274 r3293 39 39 40 40 #include "CorePrereqs.h" 41 41 42 #include <set> 42 43 #include <vector> -
code/branches/core4/src/core/input/JoyStickQuantityListener.h
r3291 r3293 43 43 class _CoreExport JoyStickQuantityListener : virtual public OrxonoxClass 44 44 { 45 friend InputManager;45 friend class InputManager; 46 46 protected: 47 47 JoyStickQuantityListener(); -
code/branches/core4/src/core/input/Mouse.cc
r3291 r3293 93 93 94 94 #ifdef ORXONOX_PLATFORM_LINUX 95 void Mouse::grab Mouse()95 void Mouse::grab() 96 96 { 97 OIS::LinuxMouse* linuxMouse = dynamic_cast<OIS::LinuxMouse*>( instancePointer_s->oisDevice_);97 OIS::LinuxMouse* linuxMouse = dynamic_cast<OIS::LinuxMouse*>(oisDevice_); 98 98 assert(linuxMouse); 99 99 linuxMouse->grab(true); 100 100 } 101 101 102 void Mouse::ungrab Mouse()102 void Mouse::ungrab() 103 103 { 104 OIS::LinuxMouse* linuxMouse = dynamic_cast<OIS::LinuxMouse*>( instancePointer_s->oisDevice_);104 OIS::LinuxMouse* linuxMouse = dynamic_cast<OIS::LinuxMouse*>(oisDevice_); 105 105 assert(linuxMouse); 106 106 linuxMouse->grab(false); -
code/branches/core4/src/core/input/Mouse.h
r3291 r3293 68 68 #ifdef ORXONOX_PLATFORM_LINUX 69 69 // TODO: Make this a feature rather than a hack 70 void grab Mouse();71 void ungrab Mouse();70 void grab(); 71 void ungrab(); 72 72 #endif 73 73 -
code/branches/core4/src/orxonox/LevelManager.h
r3249 r3293 34 34 #include <cassert> 35 35 #include <list> 36 #include <string> 36 37 #include "core/OrxonoxClass.h" 37 38 -
code/branches/core4/src/orxonox/gui/GUIManager.cc
r3274 r3293 69 69 void logEvent(const CEGUI::String& message, CEGUI::LoggingLevel level = CEGUI::Standard) 70 70 { 71 int orxonoxLevel ;71 int orxonoxLevel = CEGUI::Standard; 72 72 switch (level) 73 73 {
Note: See TracChangeset
for help on using the changeset viewer.