diff --git a/deps/mongoose b/deps/mongoose index c722cfec..8d72c2a7 160000 --- a/deps/mongoose +++ b/deps/mongoose @@ -1 +1 @@ -Subproject commit c722cfec18231c6d18ab8a73993b763aa1e0dd7e +Subproject commit 8d72c2a7b22c36f72b0e0be5dd4b54439f2c57df diff --git a/src/Components/Modules/Maps.cpp b/src/Components/Modules/Maps.cpp index 877849a3..39776ccb 100644 --- a/src/Components/Modules/Maps.cpp +++ b/src/Components/Modules/Maps.cpp @@ -416,6 +416,7 @@ namespace Components Maps::AddDependency("mp_shipment_long", "iw4x_dependencies_mp"); Maps::AddDependency("mp_firingrange", "iw4x_dependencies_mp"); Maps::AddDependency("mp_rust_long", "iw4x_dependencies_mp"); + Maps::AddDependency("mp_ambush_sh", "iw4x_dependencies_mp"); #if defined(DEBUG) && defined(ENABLE_DXSDK) Command::Add("dumpmap", [] (Command::Params) diff --git a/src/Components/Modules/Zones.cpp b/src/Components/Modules/Zones.cpp index f962feb7..59870a1a 100644 --- a/src/Components/Modules/Zones.cpp +++ b/src/Components/Modules/Zones.cpp @@ -206,6 +206,11 @@ namespace Components if (Zones::ZoneVersion >= 359) { size = 3120; + + if (Zones::ZoneVersion >= 365) + { + size = 3124; + } } } } @@ -320,7 +325,7 @@ namespace Components if (Zones::ZoneVersion >= 359) { // 53 soundalias name references; up to and including 1124 - for (int i = 0, offset = 912; i < 53; ++i, offset += 4) + for (int i = 0, offset = 916; i < 52; ++i, offset += 4) { *Game::varsnd_alias_list_name = reinterpret_cast(varWeaponCompleteDef + offset); Game::Load_SndAliasCustom(*Game::varsnd_alias_list_name); @@ -765,6 +770,11 @@ namespace Components *Game::varXString = reinterpret_cast(varWeaponCompleteDef + 2988); Game::Load_XString(false); + if (Zones::ZoneVersion >= 365) + { + varWeaponCompleteDef += 4; + } + *Game::varXString = reinterpret_cast(varWeaponCompleteDef + 3000); Game::Load_XString(false);