From 9443d20ef7f83acaa6e231232ebc66adab805dc0 Mon Sep 17 00:00:00 2001 From: Danilo Date: Tue, 21 May 2024 09:48:11 -0300 Subject: [PATCH] Corrige erro no GamePad --- framework/platform/game-dx.cpp | 7 +++---- framework/platform/gamepad-dx.cpp | 3 +-- inc/platform-dx/implementations.hpp | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/framework/platform/game-dx.cpp b/framework/platform/game-dx.cpp index 91d558b..96567c1 100644 --- a/framework/platform/game-dx.cpp +++ b/framework/platform/game-dx.cpp @@ -41,10 +41,6 @@ namespace xna { } void Game::Initialize() { - Keyboard::Initialize(); - Mouse::Initialize(); - GamePad::Initialize(); - #if (_WIN32_WINNT >= 0x0A00 /*_WIN32_WINNT_WIN10*/) Microsoft::WRL::Wrappers::RoInitializeWrapper initialize(RO_INIT_MULTITHREADED); if (FAILED(initialize)) @@ -58,6 +54,9 @@ namespace xna { MessageBox(nullptr, "Ocorreu um erro ao chamar CoInitializeEx.", "XN65", MB_OK); } #endif + Keyboard::Initialize(); + Mouse::Initialize(); + GamePad::Initialize(); _audioEngine = New(); diff --git a/framework/platform/gamepad-dx.cpp b/framework/platform/gamepad-dx.cpp index 59e9e60..ecbe4f7 100644 --- a/framework/platform/gamepad-dx.cpp +++ b/framework/platform/gamepad-dx.cpp @@ -2,10 +2,9 @@ #include "input/gamepad.hpp" namespace xna { - - void GamePad::Initialize() { impl = uNew(); + impl->_dxGamePad = uNew(); } GamePadState GamePad::GetState(PlayerIndex index) { diff --git a/inc/platform-dx/implementations.hpp b/inc/platform-dx/implementations.hpp index 74ef04e..d47b409 100644 --- a/inc/platform-dx/implementations.hpp +++ b/inc/platform-dx/implementations.hpp @@ -148,6 +148,6 @@ namespace xna { } } - inline static uptr _dxGamePad = uNew(); + inline static uptr _dxGamePad = nullptr; }; } \ No newline at end of file