From d77c74f5a9b2f01329ed851d6baecf58e7e8bf53 Mon Sep 17 00:00:00 2001 From: RektInator Date: Tue, 30 May 2017 16:32:17 +0200 Subject: [PATCH] [Weapon] Runtime memory editing removed. --- src/Components/Modules/Weapon.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Components/Modules/Weapon.cpp b/src/Components/Modules/Weapon.cpp index ffb8bead..e80e95e6 100644 --- a/src/Components/Modules/Weapon.cpp +++ b/src/Components/Modules/Weapon.cpp @@ -423,8 +423,8 @@ namespace Components void* Weapon::LoadNoneWeaponHook() { // load anim scripts now, rather than a bit later on - ((void(*)())0x4E46A0)(); - Utils::Hook::Nop(0x4B3670, 5); + Utils::Hook::Call(0x4E46A0)(); + return Game::DB_FindXAssetHeader(Game::XAssetType::ASSET_TYPE_WEAPON, "none").data; } @@ -452,6 +452,8 @@ namespace Components // Skip double loading for fs_game Utils::Hook::Set(0x4081FD, 0xEB); + // Weapon swap fix + Utils::Hook::Nop(0x4B3670, 5); Utils::Hook(0x57B4F0, LoadNoneWeaponHookStub).install()->quick(); // Don't load bounce sounds for now, it causes crashes