diff --git a/src/AnticheatMgr.cpp b/src/AnticheatMgr.cpp index 940eb61..03dfdca 100644 --- a/src/AnticheatMgr.cpp +++ b/src/AnticheatMgr.cpp @@ -16,7 +16,7 @@ #include "AnticheatMgr.h" #include "MapManager.h" #include "Player.h" -#include "Configuration\Config.h" +#include "Configuration/Config.h" #define CLIMB_ANGLE 1.9f AnticheatMgr::AnticheatMgr() @@ -38,7 +38,7 @@ void AnticheatMgr::JumpHackDetection(Player* player, MovementInfo /* movementInf if (m_Players[key].GetLastOpcode() == MSG_MOVE_JUMP && opcode == MSG_MOVE_JUMP) { BuildReport(player, JUMP_HACK_REPORT); - sLog->outString("AnticheatMgr:: Jump-Hack detected player %s (%u)", player->GetName(), player->GetGUIDLow()); + sLog->outString("AnticheatMgr:: Jump-Hack detected player %s (%u)", player->GetName().c_str() player->GetGUIDLow()); } } @@ -67,10 +67,10 @@ void AnticheatMgr::WalkOnWaterHackDetection(Player* player, MovementInfo moveme player->RemoveAura(SPELL_AURA_WATER_WALK);*/ //cba to double check this, just adding a kick option player->GetSession()->KickPlayer(true); - sLog->outString("AnticheatMgr:: Walk on Water - Hack detected and counteracted by kicking player %s (%u)", player->GetName(), player->GetGUIDLow()); + sLog->outString("AnticheatMgr:: Walk on Water - Hack detected and counteracted by kicking player %s (%u)", player->GetName().c_str() player->GetGUIDLow()); } else { - sLog->outString("AnticheatMgr:: Walk on Water - Hack detected player %s (%u)", player->GetName(), player->GetGUIDLow()); + sLog->outString("AnticheatMgr:: Walk on Water - Hack detected player %s (%u)", player->GetName().c_str() player->GetGUIDLow()); } BuildReport(player, WALK_WATER_HACK_REPORT); @@ -92,10 +92,10 @@ void AnticheatMgr::FlyHackDetection(Player* player, MovementInfo movementInfo) return; if (sConfigMgr->GetBoolDefault("Anticheat.KickPlayerFlyHack", false)) { - sLog->outString("AnticheatMgr:: Fly-Hack detected and counteracted by kicking player %s (%u)", player->GetName(), player->GetGUIDLow()); + sLog->outString("AnticheatMgr:: Fly-Hack detected and counteracted by kicking player %s (%u)", player->GetName().c_str() player->GetGUIDLow()); player->GetSession()->KickPlayer(true); }else - sLog->outString( "AnticheatMgr:: Fly-Hack detected player %s (%u)", player->GetName(), player->GetGUIDLow()); + sLog->outString( "AnticheatMgr:: Fly-Hack detected player %s (%u)", player->GetName().c_str() player->GetGUIDLow()); BuildReport(player,FLY_HACK_REPORT); } @@ -124,7 +124,7 @@ void AnticheatMgr::TeleportPlaneHackDetection(Player* player, MovementInfo movem // we are not really walking there if (z_diff > 1.0f) { - sLog->outString("AnticheatMgr:: Teleport To Plane - Hack detected player %s (%u)", player->GetName(), player->GetGUIDLow()); + sLog->outString("AnticheatMgr:: Teleport To Plane - Hack detected player %s (%u)", player->GetName().c_str() player->GetGUIDLow()); BuildReport(player, TELEPORT_PLANE_HACK_REPORT); } } @@ -185,7 +185,7 @@ void AnticheatMgr::ClimbHackDetection(Player *player, MovementInfo movementInfo, if (angle > CLIMB_ANGLE) { - sLog->outString("AnticheatMgr:: Climb-Hack detected player %s (%u)", player->GetName(), player->GetGUIDLow()); + sLog->outString("AnticheatMgr:: Climb-Hack detected player %s (%u)", player->GetName().c_str() player->GetGUIDLow()); BuildReport(player, CLIMB_HACK_REPORT); } } @@ -233,7 +233,7 @@ void AnticheatMgr::SpeedHackDetection(Player* player, MovementInfo movementInfo) if (clientSpeedRate > speedRate) { BuildReport(player, SPEED_HACK_REPORT); - sLog->outString("AnticheatMgr:: Speed-Hack detected player %s (%u)", player->GetName(), player->GetGUIDLow()); + sLog->outString("AnticheatMgr:: Speed-Hack detected player %s (%u)", player->GetName().c_str() player->GetGUIDLow()); } } diff --git a/src/AnticheatScripts.cpp b/src/AnticheatScripts.cpp index f1cc2e4..221aef7 100644 --- a/src/AnticheatScripts.cpp +++ b/src/AnticheatScripts.cpp @@ -56,8 +56,9 @@ public: if (!reload) { std::string conf_path = _CONF_DIR; std::string cfg_file = conf_path + "/Anticheat.conf"; - if (WIN32) + #ifdef WIN32 cfg_file = "Anticheat.conf"; + #endif // WIN32 std::string cfg_def_file = cfg_file + ".dist"; sConfigMgr->LoadMore(cfg_def_file.c_str()); @@ -81,7 +82,7 @@ class AnticheatMovementHandlerScript : public MovementHandlerScript : MovementHandlerScript("AnticheatMovementHandlerScript") { } - void AnticheatMovementHandlerScript::OnPlayerMove(Player* player, MovementInfo mi, uint32 opcode) override + void OnPlayerMove(Player* player, MovementInfo mi, uint32 opcode) override { if (!AccountMgr::IsGMAccount(player->GetSession()->GetSecurity()) || sConfigMgr->GetBoolDefault("Anticheat.EnabledOnGmAccounts", false)) sAnticheatMgr->StartHackDetection(player, mi, opcode); diff --git a/src/cs_anticheat.cpp b/src/cs_anticheat.cpp index b1745f8..9b720f0 100644 --- a/src/cs_anticheat.cpp +++ b/src/cs_anticheat.cpp @@ -17,7 +17,7 @@ #include "ObjectMgr.h" #include "Chat.h" #include "AnticheatMgr.h" -#include "Configuration\Config.h" +#include "Configuration/Config.h" class anticheat_commandscript : public CommandScript {