Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 330 vs 331 for /trunk/Source Code/Hardware/Input/InputInterface.cpp

Diff revisions: vs.
  @@ -33,7 +33,7 @@
33 33 PRINT_FN(Locale::get("INPUT_CREATE_OK"), _pInputInterface->inputSystemName().c_str());
34 34
35 35 // Create the event handler.
36 - _pEventHdlr = New EventHandler(this, kernel);
36 + _pEventHdlr = MemoryManager_NEW EventHandler(this, kernel);
37 37 DIVIDE_ASSERT(_pEventHdlr != nullptr, "InputInterface error: EventHandler allocation failed!");
38 38
39 39 try {
  @@ -59,13 +59,13 @@
59 59 }
60 60
61 61 // Create the joystick manager.
62 - _pJoystickInterface = New JoystickInterface(_pInputInterface, _pEventHdlr);
62 + _pJoystickInterface = MemoryManager_NEW JoystickInterface(_pInputInterface, _pEventHdlr);
63 63 if (!_pJoystickInterface->wasFFDetected()) {
64 64 PRINT_FN(Locale::get("WARN_INPUT_NO_FORCE_FEEDBACK"));
65 - MemoryManager::SAFE_DELETE( _pJoystickInterface );
65 + MemoryManager::DELETE( _pJoystickInterface );
66 66 } else{
67 67 // Create force feedback effect manager.
68 - _pEffectMgr = New EffectManager(_pJoystickInterface, _nEffectUpdateFreq);
68 + _pEffectMgr = MemoryManager_NEW EffectManager(_pJoystickInterface, _nEffectUpdateFreq);
69 69 // Initialize the event handler.
70 70 _pEventHdlr->initialize(_pJoystickInterface, _pEffectMgr);
71 71 }
  @@ -150,15 +150,15 @@
150 150 _pInputInterface->destroyInputObject(*it);
151 151 }
152 152 _pJoysticks.clear();
153 - MemoryManager::SAFE_DELETE( _pJoystickInterface );
153 + MemoryManager::DELETE( _pJoystickInterface );
154 154 }
155 155
156 156 OIS::InputManager::destroyInputSystem(_pInputInterface);
157 157 _pInputInterface = nullptr;
158 158 }
159 159
160 - MemoryManager::SAFE_DELETE( _pEffectMgr );
161 - MemoryManager::SAFE_DELETE( _pEventHdlr );
160 + MemoryManager::DELETE( _pEffectMgr );
161 + MemoryManager::DELETE( _pEventHdlr );
162 162
163 163 #if defined OIS_LINUX_PLATFORM
164 164 // Be nice to X and clean up the x window