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

Ambush tests

Browse Source
This commit is contained in:
momo5502 2016-10-24 21:52:58 +02:00
parent 51aba51a3f
commit 9c2fca2efe
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/mongoose vendored

@ -1 +1 @@
Subproject commit c722cfec18231c6d18ab8a73993b763aa1e0dd7e Subproject commit 8d72c2a7b22c36f72b0e0be5dd4b54439f2c57df

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

@ -416,6 +416,7 @@ namespace Components
Maps::AddDependency("mp_shipment_long", "iw4x_dependencies_mp"); Maps::AddDependency("mp_shipment_long", "iw4x_dependencies_mp");
Maps::AddDependency("mp_firingrange", "iw4x_dependencies_mp"); Maps::AddDependency("mp_firingrange", "iw4x_dependencies_mp");
Maps::AddDependency("mp_rust_long", "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) #if defined(DEBUG) && defined(ENABLE_DXSDK)
Command::Add("dumpmap", [] (Command::Params) Command::Add("dumpmap", [] (Command::Params)

12
src/Components/Modules/Zones.cpp
View File

@ -206,6 +206,11 @@ namespace Components
if (Zones::ZoneVersion >= 359) if (Zones::ZoneVersion >= 359)
{ {
size = 3120; size = 3120;
if (Zones::ZoneVersion >= 365)
{
size = 3124;
}
} }
} }
} }
@ -320,7 +325,7 @@ namespace Components
if (Zones::ZoneVersion >= 359) if (Zones::ZoneVersion >= 359)
{ {
// 53 soundalias name references; up to and including 1124 // 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<Game::snd_alias_list_t**>(varWeaponCompleteDef + offset); *Game::varsnd_alias_list_name = reinterpret_cast<Game::snd_alias_list_t**>(varWeaponCompleteDef + offset);
Game::Load_SndAliasCustom(*Game::varsnd_alias_list_name); Game::Load_SndAliasCustom(*Game::varsnd_alias_list_name);
@ -765,6 +770,11 @@ namespace Components
*Game::varXString = reinterpret_cast<char**>(varWeaponCompleteDef + 2988); *Game::varXString = reinterpret_cast<char**>(varWeaponCompleteDef + 2988);
Game::Load_XString(false); Game::Load_XString(false);
if (Zones::ZoneVersion >= 365)
{
varWeaponCompleteDef += 4;
}
*Game::varXString = reinterpret_cast<char**>(varWeaponCompleteDef + 3000); *Game::varXString = reinterpret_cast<char**>(varWeaponCompleteDef + 3000);
Game::Load_XString(false); Game::Load_XString(false);