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

Mapents changes

Browse Source
This commit is contained in:
Federico Cecchetto 2022-08-21 04:04:07 +02:00
parent 7f414bf768
commit da7bd08bad
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/client/component/mapents.cpp
View File

@ -205,6 +205,16 @@ namespace mapents
return get_mapents_data().has_value(); return get_mapents_data().has_value();
} }
bool should_load_addon_mapents_stub(const char* a1, void* a2)
{
if (should_load_addon_mapents())
{
return true;
}
return utils::hook::invoke<bool>(0x140609570, a1, a2); // Com_IsAddonMap
}
void try_parse_mapents(const std::string& path, const std::string& data, game::AddonMapEnts* mapents) void try_parse_mapents(const std::string& path, const std::string& data, game::AddonMapEnts* mapents)
{ {
const auto parsed = parse_mapents(data); const auto parsed = parse_mapents(data);
@ -231,6 +241,12 @@ namespace mapents
game::XAssetHeader db_find_xasset_header_stub(game::XAssetType type, const char* name, int allow_create_default) game::XAssetHeader db_find_xasset_header_stub(game::XAssetType type, const char* name, int allow_create_default)
{ {
if (!should_load_addon_mapents())
{
printf("db_find_xasset_header_stub %s\n", name);
return game::DB_FindXAssetHeader(type, name, allow_create_default);
}
const auto _0 = gsl::finally(&mapents::clear_dvars); const auto _0 = gsl::finally(&mapents::clear_dvars);
const auto mapents = allocator.allocate<game::AddonMapEnts>(); const auto mapents = allocator.allocate<game::AddonMapEnts>();
@ -324,7 +340,7 @@ namespace mapents
{ {
if (value == id) if (value == id)
{ {
key = token; key = "\"" + token + "\"";
break; break;
} }
} }
@ -385,7 +401,7 @@ namespace mapents
}); });
utils::hook::call(0x14058BDD3, db_find_xasset_header_stub); utils::hook::call(0x14058BDD3, db_find_xasset_header_stub);
utils::hook::call(0x14058BD6B, should_load_addon_mapents); utils::hook::call(0x14058BD6B, should_load_addon_mapents_stub);
utils::hook::call(0x1406B3384, cm_trigger_model_bounds_stub); utils::hook::call(0x1406B3384, cm_trigger_model_bounds_stub);
add_field("script_specialops", game::SCRIPT_INTEGER, 0x20000); add_field("script_specialops", game::SCRIPT_INTEGER, 0x20000);