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

resolve merge conflicts

Browse Source
This commit is contained in:
TotallyNotElite 2018-10-26 17:48:10 +02:00
commit f830972131
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/hacks/CatBot.cpp
View File

@ -223,7 +223,6 @@ void reportall()
player_info_s info;
if (g_IEngine->GetPlayerInfo(i, &info))
{
// Need to use SteamID ignore
if (player_tools::shouldTargetSteamId(info.friendsID) !=
player_tools::IgnoreReason::DO_NOT_IGNORE)
continue;

8
src/hacks/FollowBot.cpp
View File

@ -175,14 +175,14 @@ static int priority_list[10][10] = {
/*0 1 2 3 4 5 6 7 8 9 */
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // No class
{ 0, 8, 2, 7, 6, 2, 5, 1, 0, 0 }, // Scout
{ 0, 1, 8, 2, 2, 2, 2, 0, 0, 0 }, // Sniper
{ 0, 1, 8, 2, 2, 2, 2, 1, 0, 0 }, // Sniper
{ 0, 6, 1, 8, 7, 5, 6, 4, 0, 0 }, // Soldier
{ 0, 6, 1, 7, 8, 5, 6, 4, 0, 0 }, // Demoman
{ 0, 3, 1, 7, 7, 1, 8, 2, 0, 0 }, // Medic
{ 0, 2, 0, 7, 6, 4, 8, 5, 0, 0 }, // Heavy
{ 0, 2, 1, 7, 6, 4, 8, 5, 0, 0 }, // Heavy
{ 0, 6, 1, 6, 5, 3, 5, 8, 0, 0 }, // Pyro
{ 0, 1, 0, 0, 0, 0, 0, 0, 8, 0 }, // Spy
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 8 } // Engineer
{ 0, 1, 1, 1, 1, 1, 1, 1, 8, 0 }, // Spy
{ 0, 1, 1, 1, 1, 1, 1, 1, 0, 8 } // Engineer
};
int ClassPriority(CachedEntity *ent)