Fixes
This commit is contained in:
parent
2554846b30
commit
8def7b71d9
@ -61,11 +61,6 @@ namespace branding
|
|||||||
class component final : public component_interface
|
class component final : public component_interface
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
void post_start() override
|
|
||||||
{
|
|
||||||
scheduler::loop(draw_branding, scheduler::pipeline::renderer);
|
|
||||||
}
|
|
||||||
|
|
||||||
void post_unpack() override
|
void post_unpack() override
|
||||||
{
|
{
|
||||||
if (game::environment::is_dedi())
|
if (game::environment::is_dedi())
|
||||||
@ -73,6 +68,8 @@ namespace branding
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
scheduler::loop(draw_branding, scheduler::pipeline::renderer);
|
||||||
|
|
||||||
ui_get_formatted_build_number_hook.create(
|
ui_get_formatted_build_number_hook.create(
|
||||||
SELECT_VALUE(0x406EC0_b, 0x1DF300_b), ui_get_formatted_build_number_stub);
|
SELECT_VALUE(0x406EC0_b, 0x1DF300_b), ui_get_formatted_build_number_stub);
|
||||||
}
|
}
|
||||||
|
@ -22,6 +22,7 @@ namespace fastfiles
|
|||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
|
utils::hook::detour db_init_load_x_file_hook;
|
||||||
utils::hook::detour db_try_load_x_file_internal_hook;
|
utils::hook::detour db_try_load_x_file_internal_hook;
|
||||||
utils::hook::detour db_find_xasset_header_hook;
|
utils::hook::detour db_find_xasset_header_hook;
|
||||||
|
|
||||||
@ -31,9 +32,14 @@ namespace fastfiles
|
|||||||
utils::concurrency::container<std::vector<HANDLE>> fastfile_handles;
|
utils::concurrency::container<std::vector<HANDLE>> fastfile_handles;
|
||||||
bool is_mod_pre_gfx = false;
|
bool is_mod_pre_gfx = false;
|
||||||
|
|
||||||
|
void db_init_load_x_file_stub(game::DBFile* file, std::uint64_t offset)
|
||||||
|
{
|
||||||
|
console::info("Loading fastfile %s\n", file->name);
|
||||||
|
return db_init_load_x_file_hook.invoke<void>(file, offset);
|
||||||
|
}
|
||||||
|
|
||||||
void db_try_load_x_file_internal(const char* zone_name, const int flags)
|
void db_try_load_x_file_internal(const char* zone_name, const int flags)
|
||||||
{
|
{
|
||||||
console::info("Loading fastfile %s\n", zone_name);
|
|
||||||
is_mod_pre_gfx = zone_name == "mod_pre_gfx"s;
|
is_mod_pre_gfx = zone_name == "mod_pre_gfx"s;
|
||||||
current_fastfile.access([&](std::string& fastfile)
|
current_fastfile.access([&](std::string& fastfile)
|
||||||
{
|
{
|
||||||
@ -74,6 +80,7 @@ namespace fastfiles
|
|||||||
dump_gsc_script(name, result);
|
dump_gsc_script(name, result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{
|
||||||
const std::string override_asset_name = "override/"s + name;
|
const std::string override_asset_name = "override/"s + name;
|
||||||
|
|
||||||
if (type == game::XAssetType::ASSET_TYPE_RAWFILE)
|
if (type == game::XAssetType::ASSET_TYPE_RAWFILE)
|
||||||
@ -101,6 +108,7 @@ namespace fastfiles
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (db_print_default_assets->current.enabled && game::DB_IsXAssetDefault(type, name))
|
if (db_print_default_assets->current.enabled && game::DB_IsXAssetDefault(type, name))
|
||||||
{
|
{
|
||||||
@ -1193,8 +1201,8 @@ namespace fastfiles
|
|||||||
public:
|
public:
|
||||||
void post_unpack() override
|
void post_unpack() override
|
||||||
{
|
{
|
||||||
db_try_load_x_file_internal_hook.create(
|
db_try_load_x_file_internal_hook.create(SELECT_VALUE(0x1F5700_b, 0x39A620_b), db_try_load_x_file_internal);
|
||||||
SELECT_VALUE(0x1F5700_b, 0x39A620_b), &db_try_load_x_file_internal);
|
db_init_load_x_file_hook.create(SELECT_VALUE(0x1C46E0_b, 0x3681E0_b), db_init_load_x_file_stub);
|
||||||
db_find_xasset_header_hook.create(game::DB_FindXAssetHeader, db_find_xasset_header_stub);
|
db_find_xasset_header_hook.create(game::DB_FindXAssetHeader, db_find_xasset_header_stub);
|
||||||
|
|
||||||
db_unload_x_zones_hook.create(SELECT_VALUE(0x1F6040_b,
|
db_unload_x_zones_hook.create(SELECT_VALUE(0x1F6040_b,
|
||||||
|
@ -136,8 +136,10 @@ namespace imagefiles
|
|||||||
}
|
}
|
||||||
|
|
||||||
void* pakfile_open_stub(void* /*handles*/, unsigned int count, int is_imagefile,
|
void* pakfile_open_stub(void* /*handles*/, unsigned int count, int is_imagefile,
|
||||||
unsigned int index, int is_localized)
|
unsigned int index, short is_localized)
|
||||||
{
|
{
|
||||||
|
console::debug("Opening %s%d.pak (localized:%d)\n", is_imagefile ? "imagefile" : "soundfile", index, is_localized);
|
||||||
|
|
||||||
if (index != CUSTOM_IMAGE_FILE_INDEX)
|
if (index != CUSTOM_IMAGE_FILE_INDEX)
|
||||||
{
|
{
|
||||||
return utils::hook::invoke<void*>(
|
return utils::hook::invoke<void*>(
|
||||||
|
@ -46,6 +46,11 @@ namespace lui
|
|||||||
public:
|
public:
|
||||||
void post_unpack() override
|
void post_unpack() override
|
||||||
{
|
{
|
||||||
|
if (game::environment::is_dedi())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (game::environment::is_mp())
|
if (game::environment::is_mp())
|
||||||
{
|
{
|
||||||
// Patch game message overflow
|
// Patch game message overflow
|
||||||
|
@ -2418,6 +2418,12 @@ namespace game
|
|||||||
DB_AuthSignature signature;
|
DB_AuthSignature signature;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct DBFile
|
||||||
|
{
|
||||||
|
char __pad0[32];
|
||||||
|
char name[64];
|
||||||
|
};
|
||||||
|
|
||||||
namespace hks
|
namespace hks
|
||||||
{
|
{
|
||||||
struct lua_State;
|
struct lua_State;
|
||||||
|
@ -158,7 +158,6 @@ FARPROC load_binary(const launcher::mode mode, uint64_t* base_address)
|
|||||||
void remove_crash_file()
|
void remove_crash_file()
|
||||||
{
|
{
|
||||||
utils::io::remove_file("__h1Exe");
|
utils::io::remove_file("__h1Exe");
|
||||||
utils::io::remove_file("h1-mod\\h1_mp64_ship.exe"); // remove this at some point
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void enable_dpi_awareness()
|
void enable_dpi_awareness()
|
||||||
|
Loading…
Reference in New Issue
Block a user