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

Add raw map entity strings reading

Browse Source
This commit is contained in:
quaK 2023-07-01 01:36:09 +03:00
parent 161d3105d1
commit 67d952622b
1 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@
#include "game/game.hpp" #include "game/game.hpp"
#include "console.hpp" #include "console.hpp"
#include "filesystem.hpp"
#include <utils/hook.hpp> #include <utils/hook.hpp>
#include <utils/string.hpp> #include <utils/string.hpp>
@ -135,16 +136,48 @@ namespace mapents
return {out_buffer}; return {out_buffer};
} }
std::string raw_ents;
bool load_raw_mapents()
{
auto mapents_name = utils::string::va("%s.ents", **reinterpret_cast<const char***>(0xA975F40_b));
if (filesystem::exists(mapents_name))
{
try
{
console::debug("Reading raw ents file \"%s\"\n", mapents_name);
raw_ents = filesystem::read_file(mapents_name);
if (!raw_ents.empty())
{
return true;
}
}
catch (const std::exception& ex)
{
console::error("Failed to read raw ents file \"%s\"\n%s\n", mapents_name, ex.what());
}
}
return false;
}
std::string entity_string; std::string entity_string;
const char* cm_entity_string_stub() const char* cm_entity_string_stub()
{
const char* ents = nullptr;
if (load_raw_mapents())
{
ents = raw_ents.data();
}
else
{ {
if (!entity_string.empty()) if (!entity_string.empty())
{ {
return entity_string.data(); return entity_string.data();
} }
const auto original = utils::hook::invoke<const char*>(SELECT_VALUE(0x3685C0_b, 0x4CD140_b)); ents = utils::hook::invoke<const char*>(SELECT_VALUE(0x3685C0_b, 0x4CD140_b));
const auto parsed = parse_mapents(original); }
const auto parsed = parse_mapents(ents);
if (parsed.has_value()) if (parsed.has_value())
{ {
entity_string = parsed.value(); entity_string = parsed.value();
@ -152,13 +185,14 @@ namespace mapents
} }
else else
{ {
return original; return ents;
} }
} }
void cm_unload_stub(void* clip_map) void cm_unload_stub(void* clip_map)
{ {
entity_string.clear(); entity_string.clear();
raw_ents.clear();
utils::hook::invoke<void>(SELECT_VALUE(0x368560_b, 0x4CD0E0_b), clip_map); utils::hook::invoke<void>(SELECT_VALUE(0x368560_b, 0x4CD0E0_b), clip_map);
} }
} }