From e30bde84583bd0da645c2d9fd2e049f98585e74f Mon Sep 17 00:00:00 2001 From: Diavolo Date: Wed, 14 Dec 2022 12:31:03 +0100 Subject: [PATCH 1/2] [Menus]: Cleanup --- src/Components/Modules/Menus.cpp | 325 ++++++++++++++++--------------- src/Components/Modules/Menus.hpp | 4 +- src/Game/Common.cpp | 1 + src/Game/Common.hpp | 3 + src/Game/Functions.cpp | 25 +-- src/Game/Functions.hpp | 21 +- src/Game/Structs.hpp | 10 +- src/STDInclude.hpp | 2 +- 8 files changed, 202 insertions(+), 189 deletions(-) diff --git a/src/Components/Modules/Menus.cpp b/src/Components/Modules/Menus.cpp index 7a4e302b..5301e3e6 100644 --- a/src/Components/Modules/Menus.cpp +++ b/src/Components/Modules/Menus.cpp @@ -6,6 +6,31 @@ namespace Components std::unordered_map Menus::MenuList; std::unordered_map Menus::MenuListList; + Game::KeywordHashEntry** menuParseKeywordHash; + + template + static int KeywordHashKey(const char* keyword) + { + auto hash = 0; + for (auto i = 0; keyword[i]; ++i) + { + hash += (i + HASH_SEED) * std::tolower(static_cast(keyword[i])); + } + return (hash + (hash >> 8)) & (128 - 1); + } + + template + static Game::KeywordHashEntry* KeywordHashFind(Game::KeywordHashEntry** table, const char* keyword) + { + auto hash = KeywordHashKey(keyword); + Game::KeywordHashEntry* key = table[hash]; + if (key && !_stricmp(key->keyword, keyword)) + { + return key; + } + return nullptr; + } + int Menus::ReserveSourceHandle() { // Check if a free slot is available @@ -27,7 +52,7 @@ namespace Components Game::script_t* Menus::LoadMenuScript(const std::string& name, const std::string& buffer) { - Game::script_t* script = Game::Script_Alloc(sizeof(Game::script_t) + 1 + buffer.length()); + auto* script = static_cast(Game::GetClearedMemory(sizeof(Game::script_t) + 1 + buffer.length())); if (!script) return nullptr; strcpy_s(script->filename, sizeof(script->filename), name.data()); @@ -37,18 +62,18 @@ namespace Components script->script_p = script->buffer; script->lastscript_p = script->buffer; - script->length = buffer.length(); + script->length = static_cast(buffer.length()); script->end_p = &script->buffer[buffer.length()]; script->line = 1; script->lastline = 1; script->tokenavailable = 0; - Game::Script_SetupTokens(script, reinterpret_cast(0x797F80)); - script->punctuations = reinterpret_cast(0x797F80); + Game::PS_CreatePunctuationTable(script, Game::default_punctuations); + script->punctuations = Game::default_punctuations; std::memcpy(script->buffer, buffer.data(), script->length + 1); - script->length = Game::Script_CleanString(script->buffer); + script->length = Game::Com_Compress(script->buffer); return script; } @@ -57,10 +82,10 @@ namespace Components { Utils::Memory::Allocator* allocator = Utils::Memory::GetAllocator(); - int handle = Menus::ReserveSourceHandle(); - if (!Menus::IsValidSourceHandle(handle)) return 0; // No free source slot! + const auto handle = ReserveSourceHandle(); + if (!IsValidSourceHandle(handle)) return 0; // No free source slot! - Game::script_t* script = Menus::LoadMenuScript(name, buffer); + auto* script = LoadMenuScript(name, buffer); if (!script) { @@ -68,8 +93,6 @@ namespace Components return 0; } - script->next = nullptr; - auto* source = allocator->allocate(); if (!source) { @@ -77,13 +100,17 @@ namespace Components return 0; } - strncpy_s(source->filename, 64, "string", 64); + std::memset(source, 0, sizeof(Game::source_s)); + + script->next = nullptr; + + strncpy_s(source->filename, "string", _TRUNCATE); source->scriptstack = script; source->tokens = nullptr; source->defines = nullptr; source->indentstack = nullptr; source->skip = 0; - source->definehash = static_cast(allocator->allocate(4096)); + source->definehash = static_cast(Game::GetClearedMemory(1024 * sizeof(Game::define_s*))); Game::sourceFiles[handle] = source; @@ -95,27 +122,9 @@ namespace Components return (handle > 0 && handle < MAX_SOURCEFILES && Game::sourceFiles[handle]); } - int Menus::KeywordHash(char* key) - { - int hash = 0; - - if (*key) - { - int sub = 3523 - reinterpret_cast(key); - do - { - char _chr = *key; - hash += reinterpret_cast(&(key++)[sub]) * tolower(_chr); - } while (*key); - } - - return (static_cast(hash) + static_cast(hash >> 8)) & 0x7F; - } - Game::menuDef_t* Menus::ParseMenu(int handle) { Utils::Memory::Allocator* allocator = Utils::Memory::GetAllocator(); - auto* menu = allocator->allocate(); if (!menu) return nullptr; @@ -149,10 +158,7 @@ namespace Components break; // Success } - int idx = Menus::KeywordHash(token.string); - - Game::keywordHash_t* key = Game::menuParseKeywordHash[idx]; - + auto* key = KeywordHashFind(menuParseKeywordHash, token.string); if (!key) { Game::PC_SourceError(handle, "unknown menu keyword %s", token.string); @@ -168,14 +174,15 @@ namespace Components if (!menu->window.name) { + Game::PC_SourceError(handle, "menu has no name"); allocator->free(menu->items); allocator->free(menu); return nullptr; } - Menus::OverrideMenu(menu); - Menus::RemoveMenu(menu->window.name); - Menus::MenuList[menu->window.name] = menu; + OverrideMenu(menu); + RemoveMenu(menu->window.name); + MenuList[menu->window.name] = menu; return menu; } @@ -188,9 +195,9 @@ namespace Components if (!menuFile.exists()) return nullptr; Game::pc_token_t token; - int handle = Menus::LoadMenuSource(menu, menuFile.getBuffer()); + int handle = LoadMenuSource(menu, menuFile.getBuffer()); - if (Menus::IsValidSourceHandle(handle)) + if (IsValidSourceHandle(handle)) { while (true) { @@ -206,23 +213,23 @@ namespace Components Game::PC_ReadTokenHandle(handle, &token); auto* filename = Utils::String::VA("ui_mp\\%s.menu", token.string); - Utils::Merge(&menus, Menus::LoadMenu(filename)); + Utils::Merge(&menus, LoadMenu(filename)); } if (!_stricmp(token.string, "menudef")) { - Game::menuDef_t* menudef = Menus::ParseMenu(handle); - if (menudef) menus.push_back({ true, menudef }); // Custom menu + auto* menudef = ParseMenu(handle); + if (menudef) menus.emplace_back(std::make_pair(true, menudef)); // Custom menu } } - Menus::FreeMenuSource(handle); + FreeMenuSource(handle); } if (menus.empty()) return nullptr; // Allocate new menu list - Game::MenuList* list = allocator->allocate(); + auto* list = allocator->allocate(); if (!list) return nullptr; list->menus = allocator->allocateArray(menus.size()); @@ -233,10 +240,10 @@ namespace Components } list->name = allocator->duplicateString(menu); - list->menuCount = menus.size(); + list->menuCount = static_cast(menus.size()); // Copy new menus - for (unsigned int i = 0; i < menus.size(); ++i) + for (std::size_t i = 0; i < menus.size(); ++i) { list->menus[i] = menus[i].second; } @@ -252,9 +259,9 @@ namespace Components if (menuFile.exists()) { Game::pc_token_t token; - int handle = Menus::LoadMenuSource(menu, menuFile.getBuffer()); + const auto handle = LoadMenuSource(menu, menuFile.getBuffer()); - if (Menus::IsValidSourceHandle(handle)) + if (IsValidSourceHandle(handle)) { while (true) { @@ -269,17 +276,17 @@ namespace Components { Game::PC_ReadTokenHandle(handle, &token); - Utils::Merge(&menus, Menus::LoadMenu(Utils::String::VA("ui_mp\\%s.menu", token.string))); + Utils::Merge(&menus, LoadMenu(Utils::String::VA("ui_mp\\%s.menu", token.string))); } if (!_stricmp(token.string, "menudef")) { - Game::menuDef_t* menudef = Menus::ParseMenu(handle); - if (menudef) menus.push_back({ true, menudef }); // Custom menu + auto* menudef = ParseMenu(handle); + if (menudef) menus.emplace_back(std::make_pair(true, menudef)); // Custom menu } } - Menus::FreeMenuSource(handle); + FreeMenuSource(handle); } } @@ -288,11 +295,13 @@ namespace Components std::vector> Menus::LoadMenu(Game::menuDef_t* menudef) { - std::vector> menus = Menus::LoadMenu(Utils::String::VA("ui_mp\\%s.menu", menudef->window.name)); + assert(menudef->window.name); + + std::vector> menus = LoadMenu(Utils::String::VA("ui_mp\\%s.menu", menudef->window.name)); if (menus.empty()) { - menus.push_back({ false, menudef }); // Native menu + menus.emplace_back(std::make_pair(false, menudef)); // Native menu } return menus; @@ -302,7 +311,7 @@ namespace Components { Utils::Memory::Allocator* allocator = Utils::Memory::GetAllocator(); - std::vector> menus = Menus::LoadMenu(menu); + auto menus = LoadMenu(menu); if (menus.empty()) return nullptr; // Allocate new menu list @@ -325,8 +334,8 @@ namespace Components newList->menus[i] = menus[i].second; } - Menus::RemoveMenuList(newList->name); - Menus::MenuListList[newList->name] = newList; + RemoveMenuList(newList->name); + MenuListList[newList->name] = newList; return newList; } @@ -366,7 +375,7 @@ namespace Components { if (i->second->window.name == std::string(newMenu.second->window.name)) { - Menus::RemoveMenu(i->second); + RemoveMenu(i->second); i = menus->erase(i); increment = false; @@ -389,13 +398,13 @@ namespace Components for (int i = 0; i < menuList->menuCount; ++i) { if (!menuList->menus[i]) continue; - Menus::SafeMergeMenus(&menus, Menus::LoadMenu(menuList->menus[i])); + SafeMergeMenus(&menus, LoadMenu(menuList->menus[i])); } // Load custom menus if (menuList->name == "ui_mp/code.txt"s) // Should be menus, but code is loaded ingame { - for (auto menu : Menus::CustomMenus) + for (auto menu : CustomMenus) { bool hasMenu = false; for (auto& loadedMenu : menus) @@ -407,15 +416,15 @@ namespace Components } } - if (!hasMenu) Menus::SafeMergeMenus(&menus, Menus::LoadMenu(menu)); + if (!hasMenu) SafeMergeMenus(&menus, LoadMenu(menu)); } } // Allocate new menu list - Game::MenuList* newList = allocator->allocate(); + auto* newList = allocator->allocate(); if (!newList) return menuList; - size_t size = menus.size(); + auto size = menus.size(); newList->menus = allocator->allocateArray(size); if (!newList->menus) { @@ -432,8 +441,8 @@ namespace Components newList->menus[i] = menus[i].second; } - Menus::RemoveMenuList(newList->name); - Menus::MenuListList[newList->name] = newList; + RemoveMenuList(newList->name); + MenuListList[newList->name] = newList; return newList; } @@ -442,7 +451,7 @@ namespace Components { Utils::Memory::Allocator* allocator = Utils::Memory::GetAllocator(); - if (!Menus::IsValidSourceHandle(handle)) return; + if (!IsValidSourceHandle(handle)) return; Game::source_t* source = Game::sourceFiles[handle]; @@ -481,28 +490,43 @@ namespace Components Game::sourceFiles[handle] = nullptr; } - void Menus::FreeMenu(Game::menuDef_t* menudef) + void Menus::Menu_FreeItemMemory(Game::itemDef_s* item) + { + AssertOffset(Game::itemDef_s, floatExpressionCount, 0x13C); + + for (auto i = 0; i < item->floatExpressionCount; ++i) + { + Game::free_expression(item->floatExpressions[i].expression); + } + + item->floatExpressionCount = 0; + } + + void Menus::FreeMenu(Game::menuDef_t* menu) { Utils::Memory::Allocator* allocator = Utils::Memory::GetAllocator(); - // Do i need to free expressions and strings? - // Or does the game take care of it? - // Seems like it does... - - if (menudef->items) + if (menu->items) { - // Seems like this is obsolete as well, - // as the game handles the memory + for (int i = 0; i < menu->itemCount; ++i) + { +#if 0 + Menu_FreeItemMemory(menu->items[i]); +#endif + } - //for (int i = 0; i < menudef->itemCount; ++i) - //{ - // Game::Menu_FreeItemMemory(menudef->items[i]); - //} - - allocator->free(menudef->items); + allocator->free(menu->items); } - allocator->free(menudef); + Game::free_expression(menu->visibleExp); + Game::free_expression(menu->rectXExp); + Game::free_expression(menu->rectYExp); + Game::free_expression(menu->rectWExp); + Game::free_expression(menu->rectHExp); + Game::free_expression(menu->openSoundExp); + Game::free_expression(menu->closeSoundExp); + + allocator->free(menu); } void Menus::FreeMenuList(Game::MenuList* menuList) @@ -513,37 +537,29 @@ namespace Components // Keep our compiler happy Game::MenuList list = { menuList->name, menuList->menuCount, menuList->menus }; - if (list.name) - { - allocator->free(list.name); - } - - if (list.menus) - { - allocator->free(list.menus); - } - + allocator->free(list.name); + allocator->free(list.menus); allocator->free(menuList); } void Menus::RemoveMenu(const std::string& menu) { - auto i = Menus::MenuList.find(menu); - if (i != Menus::MenuList.end()) + auto i = MenuList.find(menu); + if (i != MenuList.end()) { - if (i->second) Menus::FreeMenu(i->second); - i = Menus::MenuList.erase(i); + if (i->second) FreeMenu(i->second); + i = MenuList.erase(i); } } void Menus::RemoveMenu(Game::menuDef_t* menudef) { - for (auto i = Menus::MenuList.begin(); i != Menus::MenuList.end();) + for (auto i = MenuList.begin(); i != MenuList.end();) { if (i->second == menudef) { - Menus::FreeMenu(menudef); - i = Menus::MenuList.erase(i); + FreeMenu(menudef); + i = MenuList.erase(i); } else { @@ -554,20 +570,20 @@ namespace Components void Menus::RemoveMenuList(const std::string& menuList) { - auto i = Menus::MenuListList.find(menuList); - if (i != Menus::MenuListList.end()) + auto i = MenuListList.find(menuList); + if (i != MenuListList.end()) { if (i->second) { for (auto j = 0; j < i->second->menuCount; ++j) { - Menus::RemoveMenu(i->second->menus[j]); + RemoveMenu(i->second->menus[j]); } - Menus::FreeMenuList(i->second); + FreeMenuList(i->second); } - i = Menus::MenuListList.erase(i); + i = MenuListList.erase(i); } } @@ -584,8 +600,7 @@ namespace Components std::string name = menu->window.name; // Find the old menu - auto i = Menus::MenuList.find(name); - if (i != Menus::MenuList.end()) + if (auto i = MenuList.find(name); i != MenuList.end()) { // We have found it, *yay* Game::menuDef_t* oldMenu = i->second; @@ -600,7 +615,7 @@ namespace Components } // Replace every old instance with our new one in our menu lists - for (auto j = Menus::MenuListList.begin(); j != Menus::MenuListList.end(); ++j) + for (auto j = MenuListList.begin(); j != MenuListList.end(); ++j) { Game::MenuList* list = j->second; @@ -615,30 +630,33 @@ namespace Components } } } + + FreeMenu(oldMenu); } } void Menus::RemoveMenuList(Game::MenuList* menuList) { if (!menuList || !menuList->name) return; - Menus::RemoveMenuList(menuList->name); + RemoveMenuList(menuList->name); } + // In your dreams void Menus::FreeEverything() { - for (auto i = Menus::MenuListList.begin(); i != Menus::MenuListList.end(); ++i) + for (auto i = MenuListList.begin(); i != MenuListList.end(); ++i) { - Menus::FreeMenuList(i->second); + FreeMenuList(i->second); } - Menus::MenuListList.clear(); + MenuListList.clear(); - for (auto i = Menus::MenuList.begin(); i != Menus::MenuList.end(); ++i) + for (auto i = MenuList.begin(); i != MenuList.end(); ++i) { - Menus::FreeMenu(i->second); + FreeMenu(i->second); } - Menus::MenuList.clear(); + MenuList.clear(); } Game::XAssetHeader Menus::MenuFindHook(Game::XAssetType /*type*/, const std::string& filename) @@ -651,23 +669,23 @@ namespace Components Game::XAssetHeader header = { nullptr }; // Free the last menulist and ui context, as we have to rebuild it with the new menus - if (Menus::MenuListList.find(filename) != Menus::MenuListList.end()) + if (MenuListList.find(filename) != MenuListList.end()) { - Game::MenuList* list = Menus::MenuListList[filename]; + Game::MenuList* list = MenuListList[filename]; for (int i = 0; list && list->menus && i < list->menuCount; ++i) { - Menus::RemoveMenuFromContext(Game::uiContext, list->menus[i]); + RemoveMenuFromContext(Game::uiContext, list->menus[i]); } - Menus::RemoveMenuList(filename); + RemoveMenuList(filename); } if (Utils::String::EndsWith(filename, ".menu")) { if (FileSystem::File(filename).exists()) { - header.menuList = Menus::LoadScriptMenu(filename.data()); + header.menuList = LoadScriptMenu(filename.data()); if (header.menuList) return header; } } @@ -682,7 +700,7 @@ namespace Components { if (FileSystem::File(filename).exists()) { - header.menuList = Menus::LoadScriptMenu(filename.data()); + header.menuList = LoadScriptMenu(filename.data()); // Reset, if we didn't find scriptmenus if (!header.menuList) @@ -693,7 +711,7 @@ namespace Components } else { - header.menuList = Menus::LoadMenuList(menuList); + header.menuList = LoadMenuList(menuList); } } else @@ -714,7 +732,7 @@ namespace Components if (originalConnect == menu) // Check if we draw the original loadscreen { - if (Menus::MenuList.find("connect") != Menus::MenuList.end()) // Check if we have a custom loadscreen, to prevent drawing the original one on top + if (MenuList.find("connect") != Menus::MenuList.end()) // Check if we have a custom loadscreen, to prevent drawing the original one on top { return false; } @@ -748,15 +766,19 @@ namespace Components // Clear last menu dc->Menus[--dc->menuCount] = nullptr; } + + FreeMenu(menu); } void Menus::Add(const std::string& menu) { - Menus::CustomMenus.push_back(menu); + CustomMenus.push_back(menu); } Menus::Menus() { + menuParseKeywordHash = reinterpret_cast**>(0x63AE928); + if (ZoneBuilder::IsEnabled()) { Game::Menu_Setup(Game::uiContext); @@ -764,18 +786,15 @@ namespace Components if (Dedicated::IsEnabled()) return; - // Ensure everything is zero'ed - Menus::FreeEverything(); - // Intercept asset finding - AssetHandler::OnFind(Game::XAssetType::ASSET_TYPE_MENU, Menus::MenuFindHook); - AssetHandler::OnFind(Game::XAssetType::ASSET_TYPE_MENULIST, Menus::MenuListFindHook); + AssetHandler::OnFind(Game::XAssetType::ASSET_TYPE_MENU, MenuFindHook); + AssetHandler::OnFind(Game::XAssetType::ASSET_TYPE_MENULIST, MenuListFindHook); // Don't open connect menu - //Utils::Hook::Nop(0x428E48, 5); + // Utils::Hook::Nop(0x428E48, 5); // Use the connect menu open call to update server motds - Utils::Hook(0x428E48, []() + Utils::Hook(0x428E48, [] { if (!Party::GetMotd().empty() && Party::Target() == *Game::connectedHost) { @@ -784,10 +803,10 @@ namespace Components }, HOOK_CALL).install()->quick(); // Intercept menu painting - Utils::Hook(0x4FFBDF, Menus::IsMenuVisible, HOOK_CALL).install()->quick(); + Utils::Hook(0x4FFBDF, IsMenuVisible, HOOK_CALL).install()->quick(); - // disable the 2 new tokens in ItemParse_rect - Utils::Hook::Set(0x640693, 0xEB); + // disable the 2 new tokens in ItemParse_rect (Fix by NTA. Probably because he didn't want to update the menus) + Utils::Hook::Set(0x640693, 0xEB); // don't load ASSET_TYPE_MENU assets for every menu (might cause patch menus to fail) Utils::Hook::Nop(0x453406, 5); @@ -806,19 +825,19 @@ namespace Components // Not quite sure if we want to do this if we're not ingame, but it's only needed for ingame menus. if ((*Game::cl_ingame)->current.enabled) { - Game::Key_SetCatcher(0, 16); + Game::Key_SetCatcher(0, Game::KEYCATCH_UI); } Game::Menus_OpenByName(Game::uiContext, params->get(1)); }); - Command::Add("reloadmenus", [](Command::Params*) + Command::Add("reloadmenus", []([[maybe_unused]] Command::Params* params) { // Close all menus Game::Menus_CloseAll(Game::uiContext); - // Free custom menus - Menus::FreeEverything(); + // Free custom menus (Get pranked) + FreeEverything(); // Only disconnect if in-game, context is updated automatically! if (Game::CL_IsCgameInitialized()) @@ -841,27 +860,27 @@ namespace Components }); // Define custom menus here - Menus::Add("ui_mp/changelog.menu"); - Menus::Add("ui_mp/theater_menu.menu"); - Menus::Add("ui_mp/pc_options_multi.menu"); - Menus::Add("ui_mp/pc_options_game.menu"); - Menus::Add("ui_mp/pc_options_gamepad.menu"); - Menus::Add("ui_mp/stats_reset.menu"); - Menus::Add("ui_mp/stats_unlock.menu"); - Menus::Add("ui_mp/security_increase_popmenu.menu"); - Menus::Add("ui_mp/mod_download_popmenu.menu"); - Menus::Add("ui_mp/popup_friends.menu"); - Menus::Add("ui_mp/menu_first_launch.menu"); - Menus::Add("ui_mp/startup_messages.menu"); - Menus::Add("ui_mp/iw4x_credits.menu"); - Menus::Add("ui_mp/resetclass.menu"); - Menus::Add("ui_mp/popup_customtitle.menu"); - Menus::Add("ui_mp/popup_customclan.menu"); + Add("ui_mp/changelog.menu"); + Add("ui_mp/theater_menu.menu"); + Add("ui_mp/pc_options_multi.menu"); + Add("ui_mp/pc_options_game.menu"); + Add("ui_mp/pc_options_gamepad.menu"); + Add("ui_mp/stats_reset.menu"); + Add("ui_mp/stats_unlock.menu"); + Add("ui_mp/security_increase_popmenu.menu"); + Add("ui_mp/mod_download_popmenu.menu"); + Add("ui_mp/popup_friends.menu"); + Add("ui_mp/menu_first_launch.menu"); + Add("ui_mp/startup_messages.menu"); + Add("ui_mp/iw4x_credits.menu"); + Add("ui_mp/resetclass.menu"); + Add("ui_mp/popup_customtitle.menu"); + Add("ui_mp/popup_customclan.menu"); } Menus::~Menus() { - // In your dreams! + // Let Windows handle the memory leaks for you! Menus::FreeEverything(); } } diff --git a/src/Components/Modules/Menus.hpp b/src/Components/Modules/Menus.hpp index 7e53759f..45ff1639 100644 --- a/src/Components/Modules/Menus.hpp +++ b/src/Components/Modules/Menus.hpp @@ -43,6 +43,7 @@ namespace Components static void FreeMenuSource(int handle); static void FreeMenuList(Game::MenuList* menuList); + static void Menu_FreeItemMemory(Game::itemDef_s* item); static void FreeMenu(Game::menuDef_t* menudef); static void RemoveMenu(const std::string& menu); @@ -55,8 +56,5 @@ namespace Components static bool IsMenuVisible(Game::UiContext* dc, Game::menuDef_t* menu); static void RemoveMenuFromContext(Game::UiContext* dc, Game::menuDef_t* menu); - - // Ugly! - static int KeywordHash(char* key); }; } diff --git a/src/Game/Common.cpp b/src/Game/Common.cpp index b1c50c67..b9b626c2 100644 --- a/src/Game/Common.cpp +++ b/src/Game/Common.cpp @@ -23,6 +23,7 @@ namespace Game Com_Quitf_t Com_Quit_f = Com_Quitf_t(0x4D4000); Com_OpenLogFile_t Com_OpenLogFile = Com_OpenLogFile_t(0x60A8D0); Com_UpdateSlowMotion_t Com_UpdateSlowMotion = Com_UpdateSlowMotion_t(0x60B2D0); + Com_Compress_t Com_Compress = Com_Compress_t(0x498220); int* com_frameTime = reinterpret_cast(0x1AD8F3C); diff --git a/src/Game/Common.hpp b/src/Game/Common.hpp index 344bdfc6..58e18b0b 100644 --- a/src/Game/Common.hpp +++ b/src/Game/Common.hpp @@ -62,6 +62,9 @@ namespace Game typedef void(*Com_UpdateSlowMotion_t)(int msec); extern Com_UpdateSlowMotion_t Com_UpdateSlowMotion; + typedef int(*Com_Compress_t)(char* data_p); + extern Com_Compress_t Com_Compress; + extern int* com_frameTime; extern int* com_fixedConsolePosition; diff --git a/src/Game/Functions.cpp b/src/Game/Functions.cpp index 8c27e020..e8bf6e6a 100644 --- a/src/Game/Functions.cpp +++ b/src/Game/Functions.cpp @@ -152,9 +152,10 @@ namespace Game R_FlushSun_t R_FlushSun = R_FlushSun_t(0x53FB50); R_SortWorldSurfaces_t R_SortWorldSurfaces = R_SortWorldSurfaces_t(0x53DC10); - Script_Alloc_t Script_Alloc = Script_Alloc_t(0x422E70); - Script_SetupTokens_t Script_SetupTokens = Script_SetupTokens_t(0x4E6950); - Script_CleanString_t Script_CleanString = Script_CleanString_t(0x498220); + GetMemory_t GetMemory = GetMemory_t(0x4E67B0); + GetClearedMemory_t GetClearedMemory = GetClearedMemory_t(0x422E70); + PS_CreatePunctuationTable_t PS_CreatePunctuationTable = PS_CreatePunctuationTable_t(0x4E6950); + free_expression_t free_expression = free_expression_t(0x4ACC70); SE_Load_t SE_Load = SE_Load_t(0x502A30); @@ -270,8 +271,7 @@ namespace Game cmd_function_t** cmd_functions = reinterpret_cast(0x1AAC658); - source_t **sourceFiles = reinterpret_cast(0x7C4A98); - keywordHash_t **menuParseKeywordHash = reinterpret_cast(0x63AE928); + source_t** sourceFiles = reinterpret_cast(0x7C4A98); float* cgameFOVSensitivityScale = reinterpret_cast(0xB2F884); @@ -399,6 +399,8 @@ namespace Game int* ui_numArenas = reinterpret_cast(0x62D2788); int* ui_arenaBufPos = reinterpret_cast(0x62D278C); + punctuation_s* default_punctuations = reinterpret_cast(0x797F80); + const char* TableLookup(StringTable* stringtable, int row, int column) { if (!stringtable || !stringtable->values || row >= stringtable->rowCount || column >= stringtable->columnCount) return ""; @@ -926,19 +928,6 @@ namespace Game } } - __declspec(naked) void Menu_FreeItemMemory(itemDef_s* /*item*/) - { - __asm - { - pushad - mov edi, [esp + 24h] - mov eax, 63D880h - call eax - popad - retn - } - } - void Menu_SetNextCursorItem(UiContext* a1, menuDef_t* a2, int unk) { __asm diff --git a/src/Game/Functions.hpp b/src/Game/Functions.hpp index 5d045c06..2834a2e0 100644 --- a/src/Game/Functions.hpp +++ b/src/Game/Functions.hpp @@ -374,14 +374,17 @@ namespace Game typedef GfxWorld*(*R_SortWorldSurfaces_t)(); extern R_SortWorldSurfaces_t R_SortWorldSurfaces; - typedef script_t*(*Script_Alloc_t)(int length); - extern Script_Alloc_t Script_Alloc; + typedef void* (*GetMemory_t)(unsigned int size); + extern GetMemory_t GetMemory; - typedef void(*Script_SetupTokens_t)(script_t* script, void* tokens); - extern Script_SetupTokens_t Script_SetupTokens; + typedef void*(*GetClearedMemory_t)(unsigned int size); + extern GetClearedMemory_t GetClearedMemory; - typedef int(*Script_CleanString_t)(char* buffer); - extern Script_CleanString_t Script_CleanString; + typedef void(*PS_CreatePunctuationTable_t)(script_s* script, punctuation_s* punctuations); + extern PS_CreatePunctuationTable_t PS_CreatePunctuationTable; + + typedef void(*free_expression_t)(Statement_s* statement); + extern free_expression_t free_expression; typedef char*(*SE_Load_t)(const char* psFileName, bool forceEnglish); extern SE_Load_t SE_Load; @@ -596,8 +599,7 @@ namespace Game extern float* cgameFOVSensitivityScale; - extern source_t **sourceFiles; - extern keywordHash_t **menuParseKeywordHash; + extern source_t** sourceFiles; extern UiContext* uiContext; @@ -727,6 +729,8 @@ namespace Game extern int* ui_numArenas; extern int* ui_arenaBufPos; + extern punctuation_s* default_punctuations; + constexpr auto MAX_MSGLEN = 0x20000; ScreenPlacement* ScrPlace_GetFullPlacement(); @@ -734,7 +738,6 @@ namespace Game void UI_FilterStringForButtonAnimation(char* str, unsigned int strMaxSize); - void Menu_FreeItemMemory(itemDef_s* item); void Menu_SetNextCursorItem(UiContext* ctx, menuDef_t* currentMenu, int unk = 1); void Menu_SetPrevCursorItem(UiContext* ctx, menuDef_t* currentMenu, int unk = 1); const char* TableLookup(StringTable* stringtable, int row, int column); diff --git a/src/Game/Structs.hpp b/src/Game/Structs.hpp index d477e789..41b050e1 100644 --- a/src/Game/Structs.hpp +++ b/src/Game/Structs.hpp @@ -7173,12 +7173,12 @@ namespace Game char string[MAX_TOKENLENGTH]; } pc_token_t; - typedef struct keywordHash_s + template + struct KeywordHashEntry { - char* keyword; - bool(*func)(menuDef_t* item, int handle); - //struct keywordHash_s *next; - } keywordHash_t; + const char* keyword; + int (*func)(T*, int); + }; enum MaterialTechniqueType { diff --git a/src/STDInclude.hpp b/src/STDInclude.hpp index e957a9ad..62a39359 100644 --- a/src/STDInclude.hpp +++ b/src/STDInclude.hpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include From 6f0438631f2705c5588301b6799d706a9c066ae2 Mon Sep 17 00:00:00 2001 From: Diavolo Date: Wed, 14 Dec 2022 12:44:06 +0100 Subject: [PATCH 2/2] [Menus]: Disable this code too --- src/Components/Modules/Menus.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Components/Modules/Menus.cpp b/src/Components/Modules/Menus.cpp index 5301e3e6..a931b553 100644 --- a/src/Components/Modules/Menus.cpp +++ b/src/Components/Modules/Menus.cpp @@ -517,7 +517,7 @@ namespace Components allocator->free(menu->items); } - +#if 0 Game::free_expression(menu->visibleExp); Game::free_expression(menu->rectXExp); Game::free_expression(menu->rectYExp); @@ -525,6 +525,7 @@ namespace Components Game::free_expression(menu->rectHExp); Game::free_expression(menu->openSoundExp); Game::free_expression(menu->closeSoundExp); +#endif allocator->free(menu); }