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

Wip skip specops entities part 2

Browse Source
This commit is contained in:
rackover 2021-07-04 18:44:25 +02:00
parent 78eadd4eb1
commit 993fe28a37
1 changed files with 68 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/Components/Modules/QuickPatch.cpp
View File

@ -396,11 +396,61 @@ namespace Components
return std::function < T >(reinterpret_cast<T*>(procAddr)); return std::function < T >(reinterpret_cast<T*>(procAddr));
} }
int __cdecl G_ParseSpawnVars(Game::SpawnVar* spawnVar){ //int __cdecl G_ParseSpawnVars(Game::SpawnVar* spawnVar){
if (Zones::Version() >= VERSION_ALPHA2) { // if (Zones::Version() >= VERSION_ALPHA2) {
for (auto i = 0; i < spawnVar->numSpawnVars; i++) // bool shouldBeRemoved = false;
// for (auto i = 0; i < spawnVar->numSpawnVars; i++)
// {
// char** kvPair = spawnVar->spawnVars[i];
// auto key = kvPair[0];
// auto val = kvPair[1];
//
// bool isSpecOps = strncmp(key, "script_specialops", 16) == 0;
// bool isSpecOpsOnly = *val == 49; // 49 => Ascii "1"
// if (isSpecOps && isSpecOpsOnly) {
// shouldBeRemoved = true;
// break;
// }
// }
// if (shouldBeRemoved) {
// for (auto i = 0; i < spawnVar->numSpawnVars; i++)
// {
// char** kvPair = spawnVar->spawnVars[i];
// auto key = kvPair[0];
// auto val = kvPair[1];
// bool isClassName = strncmp(key, "classname", 9) == 0;
// if (isClassName) {
// val = "dyn_lmao";
// }
// }
// }
// if (shouldBeRemoved) {
// spawnVar->numSpawnVars = 0;
// spawnVar->numSpawnVarChars = 0;
// spawnVar->spawnVarsValid = false;
// //Components::Logger::Print("G_SpawnString: Removed %s\n", spawnVar->spawnVarChars);
// }
// }
//
// return Utils::Hook::Call<int(Game::SpawnVar*)>(0x4B3410)(spawnVar);
//}
BOOL __cdecl IsDynClassname(char* a1) {
//if (Zones::Version() >= VERSION_ALPHA2) {
bool shouldBeRemoved = false;
for (auto i = 0; i < Game::spawnVars->numSpawnVars; i++)
{ {
char** kvPair = spawnVar->spawnVars[i]; char** kvPair = Game::spawnVars->spawnVars[i];
auto key = kvPair[0]; auto key = kvPair[0];
auto val = kvPair[1]; auto val = kvPair[1];
@ -408,16 +458,19 @@ namespace Components
bool isSpecOpsOnly = *val == 49; // 49 => Ascii "1" bool isSpecOpsOnly = *val == 49; // 49 => Ascii "1"
if (isSpecOps && isSpecOpsOnly) { if (isSpecOps && isSpecOpsOnly) {
spawnVar->spawnVars[i] = nullptr; Components::Logger::Print("Prevented spawning of entity: %s\n", Game::spawnVars->spawnVarChars);
return true; // This will prevent spawning hopefully;
} }
} }
} //}
Components::Logger::Print("G_SpawnString: %s %d\n", spawnVar->spawnVarChars, spawnVar->numSpawnVarChars); return Utils::Hook::Call<BOOL(char*)>(0x444810)(a1);
return Utils::Hook::Call<int(Game::SpawnVar*)>(0x4B3410)(spawnVar);
} }
//void __cdecl G_SpawnItem(Game::gentity_s* a1, signed int a2) {
//}
QuickPatch::QuickPatch() QuickPatch::QuickPatch()
{ {
QuickPatch::FrameTime = 0; QuickPatch::FrameTime = 0;
@ -461,9 +514,11 @@ namespace Components
(0xC000007B /*0x0000000A*/, 0, nullptr, nullptr, OptionShutdownSystem, &response); (0xC000007B /*0x0000000A*/, 0, nullptr, nullptr, OptionShutdownSystem, &response);
}); });
Utils::Hook(0x4D8845, G_ParseSpawnVars, HOOK_CALL).install()->quick(); Utils::Hook(0x5FBD6E, IsDynClassname, HOOK_CALL).install()->quick();
Utils::Hook(0x4D8880, G_ParseSpawnVars, HOOK_CALL).install()->quick();
Utils::Hook(0x4D886A, G_ParseSpawnVars, HOOK_CALL).install()->quick(); //Utils::Hook(0x4D8845, G_ParseSpawnVars, HOOK_CALL).install()->quick();
//Utils::Hook(0x4D8880, G_ParseSpawnVars, HOOK_CALL).install()->quick();
//Utils::Hook(0x4D886A, G_ParseSpawnVars, HOOK_CALL).install()->quick();
// bounce dvar // bounce dvar
sv_enableBounces = Game::Dvar_RegisterBool("sv_enableBounces", false, Game::DVAR_FLAG_REPLICATED, "Enables bouncing on the server"); sv_enableBounces = Game::Dvar_RegisterBool("sv_enableBounces", false, Game::DVAR_FLAG_REPLICATED, "Enables bouncing on the server");