Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Refresh arena when travelling from one map to another

Browse Source
This commit is contained in:
Roxanne 2023-12-01 11:13:28 +01:00
parent cfe7446732
commit bc30afcbaf
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Components/Modules/Maps.cpp
View File

@ -105,14 +105,15 @@ namespace Components
{ {
std::string data = RawFiles::ReadRawFile(name, buffer, size); std::string data = RawFiles::ReadRawFile(name, buffer, size);
if (Maps::UserMap.isValid()) if (Maps::UserMap.isValid())
{ {
const auto mapname = Maps::UserMap.getName(); const auto mapname = Maps::UserMap.getName();
const auto arena = GetArenaPath(mapname); const auto arena = GetArenaPath(mapname);
if (Utils::IO::FileExists(arena)) if (Utils::IO::FileExists(arena))
{ {
data.append(Utils::IO::ReadFile(arena)); // Replace all arenas with just this one
data = Utils::IO::ReadFile(arena);
} }
} }
@ -850,6 +851,9 @@ namespace Components
// Load usermap arena file // Load usermap arena file
Utils::Hook(0x630A88, Maps::LoadArenaFileStub, HOOK_CALL).install()->quick(); Utils::Hook(0x630A88, Maps::LoadArenaFileStub, HOOK_CALL).install()->quick();
// Always refresh arena when loading or unloading a zone
Utils::Hook::Nop(0x485017, 2);
// Allow hiding specific smodels // Allow hiding specific smodels
Utils::Hook(0x50E67C, Maps::HideModelStub, HOOK_CALL).install()->quick(); Utils::Hook(0x50E67C, Maps::HideModelStub, HOOK_CALL).install()->quick();