fix m_flAccuracy spray calculation

s1lentq · Sep 11, 2021 · db4e018 · db4e018
1 parent c90ac83
commit db4e018
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 13 deletions.
diff --git a/regamedll/dlls/weapons.h b/regamedll/dlls/weapons.h
@@ -581,7 +581,11 @@ const float MP5N_MAX_SPEED = 250.0f;
 const float MP5N_DAMAGE = 26.0f;
 const float MP5N_RANGE_MODIFER = 0.84f;
 const float MP5N_RELOAD_TIME = 2.63f;
-const float MP5N_ACCURACY_DIVISOR = 200.1f;
+#ifdef REGAMEDLL_FIXES
+const float MP5N_ACCURACY_DIVISOR = 220.1f;
+#else
+const double MP5N_ACCURACY_DIVISOR = 220.1;
+#endif
 
 enum mp5n_e
 {

diff --git a/regamedll/dlls/wpn_shared/wpn_ak47.cpp b/regamedll/dlls/wpn_shared/wpn_ak47.cpp
@@ -94,7 +94,7 @@ void CAK47::AK47Fire(float flSpread, float flCycleTime, BOOL fUseAutoAim)
  m_bDelayFire = true;
  m_iShotsFired++;
 
- m_flAccuracy = ((m_iShotsFired * m_iShotsFired * m_iShotsFired) / 200) + 0.35f;
+ m_flAccuracy = ((m_iShotsFired * m_iShotsFired * m_iShotsFired) / AK47_ACCURACY_DIVISOR) + 0.35f;
 
  if (m_flAccuracy > 1.25f)
  m_flAccuracy = 1.25f;

diff --git a/regamedll/dlls/wpn_shared/wpn_aug.cpp b/regamedll/dlls/wpn_shared/wpn_aug.cpp
@@ -104,7 +104,7 @@ void CAUG::AUGFire(float flSpread, float flCycleTime, BOOL fUseAutoAim)
  m_bDelayFire = true;
  m_iShotsFired++;
 
- m_flAccuracy = ((m_iShotsFired * m_iShotsFired * m_iShotsFired) / 215) + 0.3f;
+ m_flAccuracy = ((m_iShotsFired * m_iShotsFired * m_iShotsFired) / AUG_ACCURACY_DIVISOR) + 0.3f;
 
  if (m_flAccuracy > 1.0f)
  m_flAccuracy = 1.0f;

diff --git a/regamedll/dlls/wpn_shared/wpn_famas.cpp b/regamedll/dlls/wpn_shared/wpn_famas.cpp
@@ -124,7 +124,7 @@ void CFamas::FamasFire(float flSpread, float flCycleTime, BOOL fUseAutoAim, BOOL
  m_bDelayFire = true;
  m_iShotsFired++;
 
- m_flAccuracy = (m_iShotsFired * m_iShotsFired * m_iShotsFired / 215) + 0.3f;
+ m_flAccuracy = (m_iShotsFired * m_iShotsFired * m_iShotsFired / FAMAS_ACCURACY_DIVISOR) + 0.3f;
 
  if (m_flAccuracy > 1.0f)
  m_flAccuracy = 1.0f;

diff --git a/regamedll/dlls/wpn_shared/wpn_galil.cpp b/regamedll/dlls/wpn_shared/wpn_galil.cpp
@@ -92,7 +92,7 @@ void CGalil::GalilFire(float flSpread, float flCycleTime, BOOL fUseAutoAim)
  m_bDelayFire = true;
  m_iShotsFired++;
 
- m_flAccuracy = ((m_iShotsFired * m_iShotsFired * m_iShotsFired) / 200) + 0.35f;
+ m_flAccuracy = ((m_iShotsFired * m_iShotsFired * m_iShotsFired) / GALIL_ACCURACY_DIVISOR) + 0.35f;
 
  if (m_flAccuracy > 1.25f)
  m_flAccuracy = 1.25f;

diff --git a/regamedll/dlls/wpn_shared/wpn_m249.cpp b/regamedll/dlls/wpn_shared/wpn_m249.cpp
@@ -91,7 +91,7 @@ void CM249::M249Fire(float flSpread, float flCycleTime, BOOL fUseAutoAim)
  m_bDelayFire = true;
  m_iShotsFired++;
 
- m_flAccuracy = ((m_iShotsFired * m_iShotsFired * m_iShotsFired) / 175) + 0.4f;
+ m_flAccuracy = ((m_iShotsFired * m_iShotsFired * m_iShotsFired) / M249_ACCURACY_DIVISOR) + 0.4f;
 
  if (m_flAccuracy > 0.9f)
  m_flAccuracy = 0.9f;

diff --git a/regamedll/dlls/wpn_shared/wpn_m4a1.cpp b/regamedll/dlls/wpn_shared/wpn_m4a1.cpp
@@ -137,7 +137,7 @@ void CM4A1::M4A1Fire(float flSpread, float flCycleTime, BOOL fUseAutoAim)
  m_bDelayFire = true;
  m_iShotsFired++;
 
- m_flAccuracy = ((m_iShotsFired * m_iShotsFired * m_iShotsFired) / 220) + 0.3f;
+ m_flAccuracy = ((m_iShotsFired * m_iShotsFired * m_iShotsFired) / M4A1_ACCURACY_DIVISOR) + 0.3f;
 
  if (m_flAccuracy > 1)
  m_flAccuracy = 1;

diff --git a/regamedll/dlls/wpn_shared/wpn_mac10.cpp b/regamedll/dlls/wpn_shared/wpn_mac10.cpp
@@ -84,7 +84,7 @@ void CMAC10::MAC10Fire(float flSpread, float flCycleTime, BOOL fUseAutoAim)
  m_bDelayFire = true;
  m_iShotsFired++;
 
- m_flAccuracy = ((m_iShotsFired * m_iShotsFired * m_iShotsFired) / 200) + 0.6f;
+ m_flAccuracy = ((m_iShotsFired * m_iShotsFired * m_iShotsFired) / MAC10_ACCURACY_DIVISOR) + 0.6f;
 
  if (m_flAccuracy > 1.65f)
  m_flAccuracy = 1.65f;

diff --git a/regamedll/dlls/wpn_shared/wpn_mp5navy.cpp b/regamedll/dlls/wpn_shared/wpn_mp5navy.cpp
@@ -85,7 +85,7 @@ void CMP5N::MP5NFire(float flSpread, float flCycleTime, BOOL fUseAutoAim)
  m_bDelayFire = true;
  m_iShotsFired++;
 
- m_flAccuracy = ((m_iShotsFired * m_iShotsFired) / 220.1) + 0.45f;
+ m_flAccuracy = ((m_iShotsFired * m_iShotsFired) / MP5N_ACCURACY_DIVISOR) + 0.45f;
 
  if (m_flAccuracy > 0.75f)
  m_flAccuracy = 0.75f;

diff --git a/regamedll/dlls/wpn_shared/wpn_p90.cpp b/regamedll/dlls/wpn_shared/wpn_p90.cpp
@@ -92,7 +92,7 @@ void CP90::P90Fire(float flSpread, float flCycleTime, BOOL fUseAutoAim)
  m_bDelayFire = true;
  m_iShotsFired++;
 
- m_flAccuracy = (m_iShotsFired * m_iShotsFired / 175) + 0.45f;
+ m_flAccuracy = (m_iShotsFired * m_iShotsFired / P90_ACCURACY_DIVISOR) + 0.45f;
 
  if (m_flAccuracy > 1)
  m_flAccuracy = 1;

diff --git a/regamedll/dlls/wpn_shared/wpn_sg552.cpp b/regamedll/dlls/wpn_shared/wpn_sg552.cpp
@@ -103,7 +103,7 @@ void CSG552::SG552Fire(float flSpread, float flCycleTime, BOOL fUseAutoAim)
  m_bDelayFire = true;
  m_iShotsFired++;
 
- m_flAccuracy = ((m_iShotsFired * m_iShotsFired * m_iShotsFired) / 220) + 0.3f;
+ m_flAccuracy = ((m_iShotsFired * m_iShotsFired * m_iShotsFired) / SG552_ACCURACY_DIVISOR) + 0.3f;
 
  if (m_flAccuracy > 1.0f)
  m_flAccuracy = 1.0f;

diff --git a/regamedll/dlls/wpn_shared/wpn_tmp.cpp b/regamedll/dlls/wpn_shared/wpn_tmp.cpp
@@ -84,7 +84,7 @@ void CTMP::TMPFire(float flSpread, float flCycleTime, BOOL fUseAutoAim)
  m_bDelayFire = true;
  m_iShotsFired++;
 
- m_flAccuracy = ((m_iShotsFired * m_iShotsFired * m_iShotsFired) / 200) + 0.55f;
+ m_flAccuracy = ((m_iShotsFired * m_iShotsFired * m_iShotsFired) / TMP_ACCURACY_DIVISOR) + 0.55f;
 
  if (m_flAccuracy > 1.4f)
  m_flAccuracy = 1.4f;

diff --git a/regamedll/dlls/wpn_shared/wpn_ump45.cpp b/regamedll/dlls/wpn_shared/wpn_ump45.cpp
@@ -88,7 +88,7 @@ void CUMP45::UMP45Fire(float flSpread, float flCycleTime, BOOL fUseAutoAim)
  m_bDelayFire = true;
  m_iShotsFired++;
 
- m_flAccuracy = ((m_iShotsFired * m_iShotsFired) / 210) + 0.5f;
+ m_flAccuracy = ((m_iShotsFired * m_iShotsFired) / UMP45_ACCURACY_DIVISOR) + 0.5f;
 
  if (m_flAccuracy > 1.0f)
  m_flAccuracy = 1.0f;