Merge branch 'develop' of https://github.com/h1-mod/h1-mod into develop

This commit is contained in:
Federico Cecchetto 2022-06-25 03:05:50 +02:00
commit 01501b4b56

View File

@ -2,6 +2,7 @@
#include "loader/component_loader.hpp" #include "loader/component_loader.hpp"
#include "dvars.hpp" #include "dvars.hpp"
#include "fastfiles.hpp"
#include "version.h" #include "version.h"
#include "command.hpp" #include "command.hpp"
#include "console.hpp" #include "console.hpp"
@ -155,6 +156,12 @@ namespace patches
game::AimAssist_AddToTargetList(aaGlob, screenTarget); game::AimAssist_AddToTargetList(aaGlob, screenTarget);
} }
void missing_content_error_stub(int, const char*)
{
game::Com_Error(game::ERR_DROP, utils::string::va("MISSING FILE\n%s.ff",
fastfiles::get_current_fastfile().data()));
}
utils::hook::detour init_network_dvars_hook; utils::hook::detour init_network_dvars_hook;
void init_network_dvars_stub(game::dvar_t* dvar) void init_network_dvars_stub(game::dvar_t* dvar)
{ {
@ -210,6 +217,9 @@ namespace patches
utils::hook::nop(SELECT_VALUE(0x1AC0CE_b, 0x135EFB_b), 2); utils::hook::nop(SELECT_VALUE(0x1AC0CE_b, 0x135EFB_b), 2);
utils::hook::nop(SELECT_VALUE(0x1A9DDC_b, 0x13388F_b), 6); utils::hook::nop(SELECT_VALUE(0x1A9DDC_b, 0x13388F_b), 6);
// Show missing fastfiles
utils::hook::call(SELECT_VALUE(0x0_b, 0x39A78E_b), missing_content_error_stub);
// Allow executing custom cfg files with the "exec" command // Allow executing custom cfg files with the "exec" command
utils::hook::call(SELECT_VALUE(0x376EB5_b, 0x156D41_b), db_read_raw_file_stub); utils::hook::call(SELECT_VALUE(0x376EB5_b, 0x156D41_b), db_read_raw_file_stub);