summaryrefslogtreecommitdiff
path: root/internal_rewrite/util.cpp
diff options
context:
space:
mode:
authornavewindre <boneyaard@gmail.com>2018-08-30 15:32:54 +0200
committernavewindre <boneyaard@gmail.com>2018-08-30 15:32:54 +0200
commitc4e18b4e500dc603fb7546b7bc9bc574fb09e0a8 (patch)
treee624bb1226d7366923b620b31ac8de96f2498ab4 /internal_rewrite/util.cpp
parent7ccb819f867493f8ec202ea3b39c94c198c64584 (diff)
epic hitchance
Diffstat (limited to 'internal_rewrite/util.cpp')
-rw-r--r--internal_rewrite/util.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/internal_rewrite/util.cpp b/internal_rewrite/util.cpp
index 7e07d2f..ee815c5 100644
--- a/internal_rewrite/util.cpp
+++ b/internal_rewrite/util.cpp
@@ -184,8 +184,8 @@ vec3_t util::get_spread_dir( void *weapon, float inaccuracy, float spread, vec3_
}
// Calculate spread.
- const float rand_inacc = rand_a * wpn->get_inaccuracy( );
- const float rand_spread = rand_b * wpn->get_spread( );
+ const float rand_inacc = rand_a * g_ctx.m_weapon_inaccuracy;
+ const float rand_spread = rand_b * g_ctx.m_weapon_spread;
const float spread_x = data->m_inaccuracy [ 0 ] * rand_inacc + data->m_spread [ 0 ] * rand_spread;
const float spread_y = data->m_inaccuracy [ 1 ] * rand_inacc + data->m_spread [ 1 ] * rand_spread;
@@ -225,10 +225,8 @@ bool util::hitchance( int target, const vec3_t& angles, int percentage ) {
float length = wpn_info->range;
- wep->update_accuracy_penalty( );
-
- float inaccuracy = wep->get_inaccuracy( );
- float spread = wep->get_spread( );
+ float inaccuracy = g_ctx.m_weapon_inaccuracy;
+ float spread = g_ctx.m_weapon_spread;
if( g_settings.rage.active->m_spread_limit( ) ) {
bool crouched = g_ctx.m_local->m_vecViewOffset( ).z < 50.f;