Rim/h2-mod
Rim/h2-mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix loadbar on specialops

Browse Source
This commit is contained in:
fed 2022-10-06 19:21:44 +02:00
parent 1bdc9a2015
commit b4d3ea9fcf
2 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/client/component/fastfiles.cpp
View File

@ -100,10 +100,7 @@ namespace fastfiles
if (localized) if (localized)
{ {
const auto language = game::SEH_GetCurrentLanguageCode(); const auto language = game::SEH_GetCurrentLanguageCode();
if (!try_load_zone(language + "_"s + name, false) && language != "eng"s) try_load_zone(language + "_"s + name, false);
{
try_load_zone("eng_" + name, false);
}
} }
if (!fastfiles::exists(name)) if (!fastfiles::exists(name))
@ -310,30 +307,26 @@ namespace fastfiles
reallocate_asset_pool_multiplier<game::ASSET_TYPE_LOCALIZE, 2>(); reallocate_asset_pool_multiplier<game::ASSET_TYPE_LOCALIZE, 2>();
} }
void add_custom_level_load_zone(void* load, const char* name, bool localized, const size_t size_est) void add_custom_level_load_zone(game::LevelLoad* load, const char* name, const size_t size_est)
{ {
if (localized) const auto language = game::SEH_GetCurrentLanguageCode();
{ const auto lang_name = language + "_"s + name;
const auto language = game::SEH_GetCurrentLanguageCode();
const auto lang_name = language + "_"s + name;
if (fastfiles::exists(lang_name)) if (fastfiles::exists(lang_name))
{ {
add_custom_level_load_zone(load, lang_name.data(), false, size_est); game::DB_LevelLoadAddZone(load, lang_name.data(), game::DB_ZONE_GAME | game::DB_ZONE_CUSTOM, size_est);
}
} }
game::DB_LevelLoadAddZone(load, name, game::DB_ZONE_GAME | game::DB_ZONE_CUSTOM, size_est); game::DB_LevelLoadAddZone(load, name, game::DB_ZONE_GAME | game::DB_ZONE_CUSTOM, size_est);
} }
void db_load_level_add_custom_zone_stub(void* load, const char* name, const unsigned int alloc_flags, void db_load_level_add_custom_zone_stub(game::LevelLoad* load, const char* name, const unsigned int alloc_flags,
const size_t size_est) const size_t size_est)
{ {
//add_custom_level_load_zone(load, name, true, size_est); add_custom_level_load_zone(load, name, size_est);
try_load_zone(name, true, true);
} }
void db_load_level_add_map_zone_stub(void* load, const char* name, const unsigned int alloc_flags, void db_load_level_add_map_zone_stub(game::LevelLoad* load, const char* name, const unsigned int alloc_flags,
const size_t size_est) const size_t size_est)
{ {
auto is_builtin_map = false; auto is_builtin_map = false;
@ -351,16 +344,21 @@ namespace fastfiles
const auto name_ = "h2_mod_patch_"s + name; const auto name_ = "h2_mod_patch_"s + name;
if (fastfiles::exists(name_)) if (fastfiles::exists(name_))
{ {
add_custom_level_load_zone(load, name_.data(), true, size_est); add_custom_level_load_zone(load, name_.data(), size_est);
} }
game::DB_LevelLoadAddZone(load, name, alloc_flags, size_est); game::DB_LevelLoadAddZone(load, name, alloc_flags, size_est);
} }
else else
{ {
add_custom_level_load_zone(load, name, true, size_est); add_custom_level_load_zone(load, name, size_est);
} }
} }
void db_load_xassets_stub(game::XZoneInfo* info, unsigned int zone_count, game::DBSyncMode sync_mode)
{
game::DB_LoadXAssets(info, zone_count, game::DB_LOAD_ASYNC);
}
} }
bool exists(const std::string& zone) bool exists(const std::string& zone)
@ -431,6 +429,9 @@ namespace fastfiles
utils::hook::call(0x14041282D, db_load_level_add_custom_zone_stub); utils::hook::call(0x14041282D, db_load_level_add_custom_zone_stub);
utils::hook::call(0x14041287C, db_load_level_add_custom_zone_stub); utils::hook::call(0x14041287C, db_load_level_add_custom_zone_stub);
// Load assets from 2nd phase (common_specialops, addon map) with DB_LOAD_SYNC
utils::hook::call(0x140414EA1, db_load_xassets_stub);
command::add("loadzone", [](const command::params& params) command::add("loadzone", [](const command::params& params)
{ {
if (params.size() < 2) if (params.size() < 2)

10
src/client/game/structs.hpp
View File

@ -1024,6 +1024,16 @@ namespace game
int freeFlags; int freeFlags;
}; };
struct LevelLoad
{
XZoneInfo info[24];
unsigned __int64 sizeEstimate[24];
char names[24][64];
unsigned int numZones;
unsigned int loadPhaseCount[3];
unsigned int numPhases;
};
struct scr_entref_t struct scr_entref_t
{ {
unsigned short entnum; unsigned short entnum;