diff --git a/CheatMenu/CheatMenu.cpp b/CheatMenu/CheatMenu.cpp index e0590d8..19b08d2 100644 --- a/CheatMenu/CheatMenu.cpp +++ b/CheatMenu/CheatMenu.cpp @@ -180,7 +180,7 @@ void MenuThread(void* param) Hook::ApplyMouseFix(); // Wait till the game is initialized - Events::initGameEvent += [] + Events::initRwEvent += [] { bGameInit = true; }; diff --git a/CheatMenu/Util.cpp b/CheatMenu/Util.cpp index 98483e6..dc28d9e 100644 --- a/CheatMenu/Util.cpp +++ b/CheatMenu/Util.cpp @@ -51,14 +51,18 @@ void Util::LoadTexturesInDirRecursive(const char* path, const char* file_ext, st HRESULT hr = -1; if (Globals::renderer == Render_DirectX9) + { hr = D3DXCreateTextureFromFileA(GetD3DDevice(), p.path().string().c_str(), - reinterpret_cast(&store_vec.back().get()->m_pTexture)); + reinterpret_cast(&store_vec.back().get()->m_pTexture)); + } else { if (LoadTextureFromFileDx11(p.path().string().c_str(), - reinterpret_cast(&store_vec.back().get()-> - m_pTexture))) + reinterpret_cast(&store_vec.back().get()-> + m_pTexture))) + { hr = S_OK; + } } if (hr == S_OK) diff --git a/CheatMenu/Vehicle.cpp b/CheatMenu/Vehicle.cpp index 071b384..5eb2960 100644 --- a/CheatMenu/Vehicle.cpp +++ b/CheatMenu/Vehicle.cpp @@ -8,6 +8,8 @@ Vehicle::Vehicle() { ParseVehiclesIDE(); ParseCarcolsDAT(); + + Events::processScriptsEvent += [this] { diff --git a/CheatMenu/Weapon.cpp b/CheatMenu/Weapon.cpp index a5abf80..3bc1933 100644 --- a/CheatMenu/Weapon.cpp +++ b/CheatMenu/Weapon.cpp @@ -146,9 +146,9 @@ void Weapon::Draw() ImGui::BeginChild("CheckboxesChild"); ImGui::Columns(2, 0, false); - Ui::CheckboxWithHint("Auto aim", &m_bAutoAim, "Enables aim assist on keyboard\n\nQ = left E = right"); - if (Ui::CheckboxWithHint("Dual weild", &m_bDualWeild, - "Dual weild pistol, shawoff, uzi, tec9\n(Other weapons don't work)")) + Ui::CheckboxWithHint("Fast aim", &m_bAutoAim, "Enables aim assist on keyboard\n\nQ = left E = right\n\nPress Q and E to switch targets.\nMoving mouse removes the target!"); + if (Ui::CheckboxWithHint("Dual wield", &m_bDualWeild, + "Dual wield pistol, shawoff, uzi, tec9\n(Other weapons don't work)")) { if (!m_bDualWeild) CWeaponInfo::LoadWeaponData();