diff --git a/framework/platform/game-dx.cpp b/framework/platform/game-dx.cpp index e85273d..b0a49d0 100644 --- a/framework/platform/game-dx.cpp +++ b/framework/platform/game-dx.cpp @@ -41,23 +41,22 @@ namespace xna { } void Game::Initialize() { - Keyboard::Initialize(); - Mouse::Initialize(); - GamePad::Initialize(); - -#if (_WIN32_WINNT >= 0x0A00 /*_WIN32_WINNT_WIN10*/) +//#if (_WIN32_WINNT >= 0x0A00 /*_WIN32_WINNT_WIN10*/) Microsoft::WRL::Wrappers::RoInitializeWrapper initialize(RO_INIT_MULTITHREADED); if (FAILED(initialize)) { MessageBox(nullptr, "Ocorreu um erro ao chamar Microsoft::WRL::Wrappers::RoInitializeWrapper.", "XN65", MB_OK); } -#else +//#else HRESULT hr = CoInitializeEx(nullptr, COINIT_MULTITHREADED); if (FAILED(hr)) { MessageBox(nullptr, "Ocorreu um erro ao chamar CoInitializeEx.", "XN65", MB_OK); } -#endif +//#endif + Keyboard::Initialize(); + Mouse::Initialize(); + GamePad::Initialize(); _audioEngine = New(); diff --git a/framework/platform/gamepad-dx.cpp b/framework/platform/gamepad-dx.cpp index ecbe4f7..0c84a34 100644 --- a/framework/platform/gamepad-dx.cpp +++ b/framework/platform/gamepad-dx.cpp @@ -4,7 +4,7 @@ namespace xna { void GamePad::Initialize() { impl = uNew(); - impl->_dxGamePad = uNew(); + impl->_dxGamePad = uNew(); } GamePadState GamePad::GetState(PlayerIndex index) { diff --git a/inc/platform-dx/implementations.hpp b/inc/platform-dx/implementations.hpp index 696d07b..9d479e5 100644 --- a/inc/platform-dx/implementations.hpp +++ b/inc/platform-dx/implementations.hpp @@ -141,13 +141,6 @@ namespace xna { }; struct GamePad::PlatformImplementation { - ~PlatformImplementation() { - if (_dxGamePad) { - _dxGamePad->Suspend(); - _dxGamePad = nullptr; - } - } - inline static uptr _dxGamePad = nullptr; };