Improve API compatibility

s1lentq · Jul 29, 2023 · 612c522 · 612c522
1 parent 139642c
commit 612c522
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/regamedll/dlls/weapons.cpp b/regamedll/dlls/weapons.cpp
@@ -815,13 +815,13 @@ BOOL CanAttack(float attack_time, float curtime, BOOL isPredicted)
 bool CBasePlayerWeapon::HasSecondaryAttack()
 {
 #ifdef REGAMEDLL_API
-	if (CSPlayerWeapon()->m_iStateSecondaryAttack != CCSPlayerWeapon::WEAPON_SECONDARY_ATTACK_NONE)
+	if (CSPlayerWeapon()->m_iStateSecondaryAttack != WEAPON_SECONDARY_ATTACK_NONE)
 	{
 		switch (CSPlayerWeapon()->m_iStateSecondaryAttack)
 		{
-			case CCSPlayerWeapon::WEAPON_SECONDARY_ATTACK_SET:
+			case WEAPON_SECONDARY_ATTACK_SET:
 				return true;
-			case CCSPlayerWeapon::WEAPON_SECONDARY_ATTACK_BLOCK:
+			case WEAPON_SECONDARY_ATTACK_BLOCK:
 				return false;
 			default:
 				break;

diff --git a/regamedll/public/regamedll/API/CSPlayerWeapon.h b/regamedll/public/regamedll/API/CSPlayerWeapon.h
@@ -28,6 +28,13 @@
 
 #pragma once
 
+enum SecondaryAtkState : uint8_t 
+{
+	WEAPON_SECONDARY_ATTACK_NONE = 0,
+	WEAPON_SECONDARY_ATTACK_SET,
+	WEAPON_SECONDARY_ATTACK_BLOCK
+};
+
 class CBasePlayerWeapon;
 class CCSPlayerWeapon: public CCSPlayerItem
 {
@@ -45,14 +52,6 @@ class CCSPlayerWeapon: public CCSPlayerItem
 
 	CBasePlayerWeapon *BasePlayerWeapon() const;
 
-public:
-	enum SecondaryAtkState : uint8_t 
-	{
-		WEAPON_SECONDARY_ATTACK_NONE = 0,
-		WEAPON_SECONDARY_ATTACK_SET,
-		WEAPON_SECONDARY_ATTACK_BLOCK
-	};
-
 public:
 	SecondaryAtkState m_iStateSecondaryAttack;
 	float m_flBaseDamage;