Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[Weapon] Reallocate config strings

Browse Source
This commit is contained in:
momo5502 2017-02-05 11:22:08 +01:00
parent dfe404b1ad
commit af05e9de2f
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/Components/Modules/Weapon.cpp
View File

@ -140,22 +140,22 @@ namespace Components
//Utils::Hook::Set(0x608856, configStrings[4139 - 0x14]); //Utils::Hook::Set(0x608856, configStrings[4139 - 0x14]);
// TODO: Check if all of these actually mark the end of the array // TODO: Check if all of these actually mark the end of the array
Utils::Hook::Set(0x405B8F, &configStrings[sizeof(configStrings)]); Utils::Hook::Set(0x405B8F, &configStrings[ARRAYSIZE(configStrings)]);
//Utils::Hook::Set(0x459121, &configStrings[sizeof(configStrings)]); //Utils::Hook::Set(0x459121, &configStrings[ARRAYSIZE(configStrings)]);
//Utils::Hook::Set(0x45A476, &configStrings[sizeof(configStrings)]); //Utils::Hook::Set(0x45A476, &configStrings[ARRAYSIZE(configStrings)]);
//Utils::Hook::Set(0x49FD56, &configStrings[sizeof(configStrings)]); //Utils::Hook::Set(0x49FD56, &configStrings[ARRAYSIZE(configStrings)]);
Utils::Hook::Set(0x4A74C9, &configStrings[sizeof(configStrings)]); Utils::Hook::Set(0x4A74C9, &configStrings[ARRAYSIZE(configStrings)]);
//Utils::Hook::Set(0x4C8196, &configStrings[sizeof(configStrings)]); //Utils::Hook::Set(0x4C8196, &configStrings[ARRAYSIZE(configStrings)]);
//Utils::Hook::Set(0x4EBCE6, &configStrings[sizeof(configStrings)]); //Utils::Hook::Set(0x4EBCE6, &configStrings[ARRAYSIZE(configStrings)]);
//Utils::Hook::Set(0x4F36D6, &configStrings[sizeof(configStrings)]); //Utils::Hook::Set(0x4F36D6, &configStrings[ARRAYSIZE(configStrings)]);
//Utils::Hook::Set(0x60807C, &configStrings[sizeof(configStrings)]); //Utils::Hook::Set(0x60807C, &configStrings[ARRAYSIZE(configStrings)]);
//Utils::Hook::Set(0x6080A9, &configStrings[sizeof(configStrings)]); //Utils::Hook::Set(0x6080A9, &configStrings[ARRAYSIZE(configStrings)]);
//Utils::Hook::Set(0x6080D0, &configStrings[sizeof(configStrings)]); //Utils::Hook::Set(0x6080D0, &configStrings[ARRAYSIZE(configStrings)]);
//Utils::Hook::Set(0x6081C4, &configStrings[sizeof(configStrings)]); //Utils::Hook::Set(0x6081C4, &configStrings[ARRAYSIZE(configStrings)]);
//Utils::Hook::Set(0x608211, &configStrings[sizeof(configStrings)]); //Utils::Hook::Set(0x608211, &configStrings[ARRAYSIZE(configStrings)]);
//Utils::Hook::Set(0x608274, &configStrings[sizeof(configStrings)]); //Utils::Hook::Set(0x608274, &configStrings[ARRAYSIZE(configStrings)]);
//Utils::Hook::Set(0x6083D6, &configStrings[sizeof(configStrings)]); //Utils::Hook::Set(0x6083D6, &configStrings[ARRAYSIZE(configStrings)]);
//Utils::Hook::Set(0x60848E, &configStrings[sizeof(configStrings)]); //Utils::Hook::Set(0x60848E, &configStrings[ARRAYSIZE(configStrings)]);
Utils::Hook(0x593CA4, Weapon::ParseConfigStrings, HOOK_CALL).install()->quick(); Utils::Hook(0x593CA4, Weapon::ParseConfigStrings, HOOK_CALL).install()->quick();
Utils::Hook(0x4BD52D, Weapon::GetWeaponConfigString, HOOK_CALL).install()->quick(); Utils::Hook(0x4BD52D, Weapon::GetWeaponConfigString, HOOK_CALL).install()->quick();
@ -163,7 +163,7 @@ namespace Components
// Patch game state // Patch game state
// The structure below is our own implementation of the gameState_t structure // The structure below is our own implementation of the gameState_t structure
struct newGameState_t static struct newGameState_t
{ {
int stringOffsets[MAX_CONFIGSTRINGS]; int stringOffsets[MAX_CONFIGSTRINGS];
char stringData[131072]; // MAX_GAMESTATE_CHARS char stringData[131072]; // MAX_GAMESTATE_CHARS
@ -406,8 +406,8 @@ namespace Components
Weapon::Weapon() Weapon::Weapon()
{ {
//Weapon::PatchLimit(); Weapon::PatchLimit();
//Weapon::PatchConfigStrings(); Weapon::PatchConfigStrings();
// Intercept weapon loading // Intercept weapon loading
AssetHandler::OnFind(Game::XAssetType::ASSET_TYPE_WEAPON, Weapon::WeaponFileLoad); AssetHandler::OnFind(Game::XAssetType::ASSET_TYPE_WEAPON, Weapon::WeaponFileLoad);

6
src/Game/Structs.hpp
View File

@ -3798,6 +3798,12 @@ namespace Game
/*CM_WorldTraceCallbacks*/ void *callbacks; /*CM_WorldTraceCallbacks*/ void *callbacks;
}; };
struct gameState_t
{
int stringOffsets[4139];
char stringData[131072];
int dataCount;
} gameState;
#ifdef __cplusplus #ifdef __cplusplus
} }