nullworks/cathook
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Readd Experimental and nomal mode + fix melee

Browse Source
This commit is contained in:
BenCat07 2018-02-18 13:28:33 +01:00 committed by GitHub
parent a8902a3939
commit 2f2165f229
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/crits.cpp
View File

@ -11,6 +11,8 @@
CatVar crit_info(CV_SWITCH, "crit_info", "0", "Show crit info"); CatVar crit_info(CV_SWITCH, "crit_info", "0", "Show crit info");
CatVar crit_key(CV_KEY, "crit_key", "0", "Crit Key"); CatVar crit_key(CV_KEY, "crit_key", "0", "Crit Key");
CatVar crit_melee(CV_SWITCH, "crit_melee", "0", "Melee crits"); CatVar crit_melee(CV_SWITCH, "crit_melee", "0", "Melee crits");
CatVar crit_experimental(CV_SWITCH, "crit_experimental", "0",
"Experimental crithack");
std::unordered_map<int, int> command_number_mod{}; std::unordered_map<int, int> command_number_mod{};
int *g_PredictionRandomSeed = nullptr; int *g_PredictionRandomSeed = nullptr;
@ -93,17 +95,27 @@ bool force_crit(IClientEntity *weapon)
logging::Info("Found critical: %d -> %d", g_pUserCmd->command_number, logging::Info("Found critical: %d -> %d", g_pUserCmd->command_number,
number); number);
if (number && number != g_pUserCmd->command_number) if (crit_experimental)
command_number_mod[g_pUserCmd->command_number] = number; {
if (number && number != g_pUserCmd->command_number)
command_number_mod[g_pUserCmd->command_number] = number;
cached_calculation.command_number = number; cached_calculation.command_number = number;
cached_calculation.weapon_entity = LOCAL_W->m_IDX; cached_calculation.weapon_entity = LOCAL_W->m_IDX;
}
else
{
if (g_pUserCmd->command_number != number && number)
g_pUserCmd->buttons &= ~IN_ATTACK;
else
g_pUserCmd->buttons |= IN_ATTACK;
}
return !!number; return !!number;
} }
void create_move() void create_move()
{ {
if (!crit_key) if (!crit_key && !crit_melee)
return; return;
if (!random_crits_enabled()) if (!random_crits_enabled())
return; return;
@ -116,7 +128,13 @@ void create_move()
return; return;
unfuck_bucket(weapon); unfuck_bucket(weapon);
if ((g_pUserCmd->buttons & IN_ATTACK) && crit_key.KeyDown() && if ((g_pUserCmd->buttons & IN_ATTACK) && crit_key.KeyDown() &&
g_pUserCmd->command_number) g_pUserCmd->command_number && crit_key)
{
force_crit(weapon);
}
else if ((g_pUserCmd->buttons & IN_ATTACK) && g_pUserCmd->command_number &&
GetWeaponMode() == weapon_melee && crit_melee &&
g_pLocalPlayer->weapon()->m_iClassID != CL_CLASS(CTFKnife))
{ {
force_crit(weapon); force_crit(weapon);
} }