#44: Улучшение античита на оружие

- Использование GetPlayerWeapon и GetPlayerAmmo вместо GetPlayerWeaponData (эти функции возвращают точные данные)
Open-GTO · May 18, 2015 · 0855e1e · 0855e1e
1 parent e6fe47f
commit 0855e1e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/sources/player/player.inc b/sources/player/player.inc
@@ -266,6 +266,7 @@ stock player_Sync(playerid)
 	pt_jetpack_Check(playerid);
 	pt_health_Sync(playerid);
 	pt_armour_Sync(playerid);
+	pt_weapon_Check(playerid);
 
 	JailPlayerCheck(playerid);
 	return 1;

diff --git a/sources/player/player_weapon.inc b/sources/player/player_weapon.inc
@@ -87,8 +87,6 @@ stock pl_weapon_Sync(playerid)
 			continue;
 		}
 
-		pt_weapon_Check(playerid, i, weapon);
-
 		if (PlayerWeapons[playerid][i][pbullets] > weapon[1]) {
 			PlayerWeapons[playerid][i][pbullets] = weapon[1];
 		}

diff --git a/sources/protections/weaponhack.inc b/sources/protections/weaponhack.inc
@@ -39,20 +39,25 @@ pt_weapon_SaveConfig(file_config)
  * For timer
  */
 
-pt_weapon_Check(playerid, slotid, weapon[2])
+pt_weapon_Check(playerid)
 {
 	if (!IsEnabled) {
 		return 0;
 	}
 
+	new
+		weaponid = GetPlayerWeapon(playerid),
+		ammo = GetPlayerAmmo(playerid),
+		slotid = GetWeaponSlot(weaponid);
+
 	// weapon
-	if (PlayerWeapons[playerid][slotid][pwid] != weapon[0] && weapon[0] != 0) {
-		Admin_SendProtectReport(playerid, _(PROTECTION_WEAPON_WEAPON), PlayerWeapons[playerid][slotid][pwid], weapon[0]);
+	if (PlayerWeapons[playerid][slotid][pwid] != weaponid && weaponid != 0) {
+		Admin_SendProtectReport(playerid, _(PROTECTION_WEAPON_WEAPON), PlayerWeapons[playerid][slotid][pwid], weaponid);
 	}
 	
 	// ammo
-	if (PlayerWeapons[playerid][slotid][pbullets] < weapon[1]) {
-		Admin_SendProtectReport(playerid, _(PROTECTION_WEAPON_AMMO), PlayerWeapons[playerid][slotid][pbullets], weapon[1]);
+	if (PlayerWeapons[playerid][slotid][pbullets] < ammo) {
+		Admin_SendProtectReport(playerid, _(PROTECTION_WEAPON_AMMO), PlayerWeapons[playerid][slotid][pbullets], ammo);
 	}
 	return 1;
 }