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

prevent name mismatch check for colors

Browse Source
This commit is contained in:
m 2024-01-20 23:55:05 -06:00
parent 0f6ada95ec
commit 416814dee7
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/client/component/colors.cpp
View File

@ -144,10 +144,6 @@ namespace colors
return; return;
} }
// color is still cleaned somewhere when sending client name between host and client
// this causes CG_MainMP_CheckForLocalClientGamertagMismatch to kick the client...
// edit: I cannot find where this happens for the life of me...
// allows colored name in-game // allows colored name in-game
utils::hook::jump(0xCFA700_b, com_clean_name_stub, true); utils::hook::jump(0xCFA700_b, com_clean_name_stub, true);
@ -160,6 +156,9 @@ namespace colors
// force new colors // force new colors
utils::hook::jump(0xE570E0_b, rb_lookup_color_stub, true); utils::hook::jump(0xE570E0_b, rb_lookup_color_stub, true);
// prevent name mismatch check
utils::hook::set<uint8_t>(0x805C10_b, 0xC3);
// add colors // add colors
add(0, 0, 0); // 0 - Black add(0, 0, 0); // 0 - Black
add(255, 49, 49); // 1 - Red add(255, 49, 49); // 1 - Red
@ -180,4 +179,4 @@ namespace colors
}; };
} }
//REGISTER_COMPONENT(colors::component) REGISTER_COMPONENT(colors::component)

28
src/client/component/stats.cpp
View File

@ -4,8 +4,9 @@
#include "game/game.hpp" #include "game/game.hpp"
#include "game/dvars.hpp" #include "game/dvars.hpp"
#include "console/console.hpp"
#include "command.hpp" #include "command.hpp"
#include "console/console.hpp"
#include "dvars.hpp"
#include "scheduler.hpp" #include "scheduler.hpp"
#include <utils/hook.hpp> #include <utils/hook.hpp>
@ -195,31 +196,31 @@ namespace stats
namespace namespace
{ {
utils::hook::detour is_unlocked1_hook; utils::hook::detour is_item_unlocked_hook;
utils::hook::detour is_unlocked2_hook; utils::hook::detour is_item_unlocked_hook2;
utils::hook::detour item_quantity_hook; utils::hook::detour item_quantity_hook;
bool is_unlocked1(__int64 a1, int a2, const char* unlock_table, unsigned __int8* value) bool is_item_unlocked_stub(__int64 a1, int a2, const char* unlock_table, unsigned __int8* value)
{ {
if (dvars::cg_unlockall_items && dvars::cg_unlockall_items->current.enabled) if (dvars::cg_unlockall_items && dvars::cg_unlockall_items->current.enabled)
{ {
return true; return true;
} }
return is_unlocked1_hook.invoke<bool>(a1, a2, unlock_table, value); return is_item_unlocked_hook.invoke<bool>(a1, a2, unlock_table, value);
} }
bool is_unlocked2(__int64 a1, int a2, const char* unlock_table, unsigned __int8* value) bool is_item_unlocked_stub2(__int64 a1, int a2, const char* unlock_table, unsigned __int8* value)
{ {
if (dvars::cg_unlockall_items && dvars::cg_unlockall_items->current.enabled) if (dvars::cg_unlockall_items && dvars::cg_unlockall_items->current.enabled)
{ {
return true; return true;
} }
return is_unlocked2_hook.invoke<bool>(a1, a2, unlock_table, value); return is_item_unlocked_hook2.invoke<bool>(a1, a2, unlock_table, value);
} }
int item_quantity(__int64 a1, int a2, int id) int item_quantity_stub(__int64 a1, int a2, int id)
{ {
auto result = item_quantity_hook.invoke<int>(a1, a2, id); auto result = item_quantity_hook.invoke<int>(a1, a2, id);
@ -285,16 +286,17 @@ namespace stats
// register dvars // register dvars
scheduler::once([]() scheduler::once([]()
{ {
dvars::cg_unlockall_items = game::Dvar_RegisterBool("cg_unlockall_items", false, game::DVAR_FLAG_SAVED, "Unlocks all items."); dvars::cg_unlockall_items = game::Dvar_RegisterBool("cg_unlockall_items", false, game::DVAR_FLAG_SAVED, "Whether items should be locked based on the player's stats or always unlocked.");
dvars::cg_unlockall_loot = game::Dvar_RegisterBool("cg_unlockall_loot", false, game::DVAR_FLAG_SAVED, "Unlocks all loot."); game::Dvar_RegisterBool("cg_unlockall_classes", false, game::DVAR_FLAG_SAVED, "Whether classes should be locked based on the player's stats or always unlocked."); // TODO: need LUI scripting
dvars::cg_unlockall_loot = game::Dvar_RegisterBool("cg_unlockall_loot", false, game::DVAR_FLAG_SAVED, "Whether loot should be locked based on the player's stats or always unlocked.");
}, scheduler::main); }, scheduler::main);
// unlockables // unlockables
is_unlocked1_hook.create(0x34E020_b, is_unlocked1); is_item_unlocked_hook.create(0x34E020_b, is_item_unlocked_stub);
is_unlocked2_hook.create(0x34CF40_b, is_unlocked2); is_item_unlocked_hook2.create(0x34CF40_b, is_item_unlocked_stub2);
// loot // loot
item_quantity_hook.create(0x51DBE0_b, item_quantity); item_quantity_hook.create(0x51DBE0_b, item_quantity_stub);
// GetPlayerData print // GetPlayerData print
utils::hook::jump(0xB84F00_b, com_ddl_print_state); // Com_DDL_PrintState utils::hook::jump(0xB84F00_b, com_ddl_print_state); // Com_DDL_PrintState