From 17a7ad65b939a269c4307041ca110bfaae13b210 Mon Sep 17 00:00:00 2001 From: gir489 <100792176+gir489returns@users.noreply.github.com> Date: Tue, 30 Apr 2024 16:59:52 -0400 Subject: [PATCH] Increased the maximum length of CEO Name from 15 to 64 characters. (#3011) * Added FMMC_KEY_TIP15 replacement of 15 to 64. * Removed legacy multiplayer chat filter. --- src/function_types.hpp | 1 - src/gta_pointers.hpp | 2 +- src/native_hooks/am_pi_menu.hpp | 25 +++++++++++++++++++ src/native_hooks/native_hooks.cpp | 3 +++ src/pointers.cpp | 14 +++-------- .../custom_text/custom_text_callbacks.cpp | 13 ++++++++++ .../custom_text/custom_text_callbacks.hpp | 1 + .../custom_text/custom_text_service.cpp | 1 + 8 files changed, 47 insertions(+), 13 deletions(-) create mode 100644 src/native_hooks/am_pi_menu.hpp diff --git a/src/function_types.hpp b/src/function_types.hpp index 8dd3ef0d..59e12cfa 100644 --- a/src/function_types.hpp +++ b/src/function_types.hpp @@ -75,7 +75,6 @@ namespace big::functions using set_gravity_level = void (*)(int level); - using check_chat_profanity = int(__int64 chat_type, const char* input, const char** output); using write_player_game_state_data_node = bool (*)(rage::netObject* plr, CPlayerGameStateDataNode* node); using get_gameplay_cam_coords = Vector3 (*)(); diff --git a/src/gta_pointers.hpp b/src/gta_pointers.hpp index edfe6928..018d20d6 100644 --- a/src/gta_pointers.hpp +++ b/src/gta_pointers.hpp @@ -104,8 +104,8 @@ namespace big functions::set_gravity_level m_set_gravity_level; PVOID m_native_return; + PVOID m_ctext_file_ptr; PVOID m_get_label_text; - functions::check_chat_profanity* m_check_chat_profanity; functions::write_player_game_state_data_node m_write_player_game_state_data_node; ChatData** m_chat_data; diff --git a/src/native_hooks/am_pi_menu.hpp b/src/native_hooks/am_pi_menu.hpp new file mode 100644 index 00000000..68e9dd38 --- /dev/null +++ b/src/native_hooks/am_pi_menu.hpp @@ -0,0 +1,25 @@ +#pragma once +#include "script_function.hpp" + +namespace big +{ + namespace am_pi_menu + { + static void DISPLAY_ONSCREEN_KEYBOARD(rage::scrNativeCallContext* src) + { + auto input_type = src->get_arg(0); + auto window_title = src->get_arg(1); + auto unk1 = src->get_arg(2); + auto input_default = src->get_arg(3); + auto unk2 = src->get_arg(4); + auto unk3 = src->get_arg(5); + auto unk4 = src->get_arg(6); + auto max_input_length = src->get_arg(7); + + if (max_input_length == 15) + max_input_length = 64; + + MISC::DISPLAY_ONSCREEN_KEYBOARD(input_type, window_title, unk1, input_default, unk2, unk3, unk4, max_input_length); + } + } +} diff --git a/src/native_hooks/native_hooks.cpp b/src/native_hooks/native_hooks.cpp index f358cdde..60d77e06 100644 --- a/src/native_hooks/native_hooks.cpp +++ b/src/native_hooks/native_hooks.cpp @@ -11,6 +11,7 @@ #include "network_session_host.hpp" #include "shop_controller.hpp" #include "tunables.hpp" +#include "am_pi_menu.hpp" #include