Merge pull request #368 from diamante0018/sounds

[Weapons] Fix *gone right*
This commit is contained in:
Dss0 2022-07-19 15:09:34 +02:00 committed by GitHub
commit 08b6924ea7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 11 deletions

4
.gitignore vendored
View File

@ -149,5 +149,5 @@ ida/*
# User scripts # User scripts
user*.bat user*.bat
# Premake binary ### Visual Studio Code
#premake5.exe .vscode/

View File

@ -404,7 +404,6 @@ namespace Components
// fs_game fixes // fs_game fixes
Utils::Hook::Nop(0x4A5D74, 2); // remove fs_game profiles Utils::Hook::Nop(0x4A5D74, 2); // remove fs_game profiles
Utils::Hook::Set<BYTE>(0x4081FD, 0xEB); // defaultweapon Utils::Hook::Set<BYTE>(0x4081FD, 0xEB); // defaultweapon
Utils::Hook::Set<BYTE>(0x452C1D, 0xEB); // LoadObj weaponDefs
// filesystem init default_mp.cfg check // filesystem init default_mp.cfg check
Utils::Hook::Nop(0x461A9E, 5); Utils::Hook::Nop(0x461A9E, 5);

View File

@ -558,15 +558,9 @@ namespace Components
Utils::Hook::Nop(0x4B3670, 5); Utils::Hook::Nop(0x4B3670, 5);
Utils::Hook(0x57B4F0, LoadNoneWeaponHookStub, HOOK_JUMP).install()->quick(); Utils::Hook(0x57B4F0, LoadNoneWeaponHookStub, HOOK_JUMP).install()->quick();
// Don't load bounce sounds for now, it causes crashes
// TODO: Actually check the weaponfiles and/or reset the soundtable correctly!
//Utils::Hook::Nop(0x57A360, 5);
//Utils::Hook::Nop(0x57A366, 6);
Utils::Hook::Nop(0x5795E9, 2);
// Clear weapons independently from fs_game // Clear weapons independently from fs_game
//Utils::Hook::Nop(0x452C1D, 2); Utils::Hook::Nop(0x452C1D, 2);
//Utils::Hook::Nop(0x452C24, 5); Utils::Hook::Nop(0x452C24, 5);
Utils::Hook(0x59E341, CG_UpdatePrimaryForAltModeWeapon_Stub, HOOK_JUMP).install()->quick(); Utils::Hook(0x59E341, CG_UpdatePrimaryForAltModeWeapon_Stub, HOOK_JUMP).install()->quick();
Utils::Hook(0x48BB25, CG_SelectWeaponIndex_Stub, HOOK_JUMP).install()->quick(); Utils::Hook(0x48BB25, CG_SelectWeaponIndex_Stub, HOOK_JUMP).install()->quick();