Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 116 vs 117 for /trunk/Source Code/Hardware/Input/InputManager.h

Diff revisions: vs.
  @@ -287,16 +287,16 @@
287 287 DEFINE_SINGLETON( InputManagerInterface )
288 288
289 289 protected:
290 - OIS::InputManager* _pInputMgr;
291 - EventHandler* _pEventHdlr;
292 - OIS::Keyboard* _pKeyboard;
293 - OIS::Mouse* _pMouse;
294 - OIS::JoyStick* _pJoystick;
295 - JoystickManager* _pJoystickMgr;
296 - EffectManager* _pEffectMgr;
290 + OIS::InputManager* _pInputMgr;
291 + EventHandler* _pEventHdlr;
292 + OIS::Keyboard* _pKeyboard;
293 + OIS::Mouse* _pMouse;
294 + OIS::JoyStick* _pJoystick;
295 + JoystickManager* _pJoystickMgr;
296 + EffectManager* _pEffectMgr;
297 297
298 - bool _bMustStop;
299 - bool _bIsInitialized;
298 + bool _bMustStop;
299 + bool _bIsInitialized;
300 300
301 301 I16 _nStatus;
302 302
  @@ -309,8 +309,7 @@
309 309
310 310
311 311
312 - InputManagerInterface()
313 - {
312 + InputManagerInterface() {
314 313 _pInputMgr = NULL;
315 314 _pEventHdlr = NULL;
316 315 _pKeyboard = NULL;
  @@ -326,7 +325,6 @@
326 325 }
327 326
328 327 public:
329 -
330 328 U8 initialize()
331 329 {
332 330 if(_bIsInitialized)