Skip to content

Commit 06edb5c

Browse files
committed
fixes: cones
1 parent e425cb4 commit 06edb5c

7 files changed

Lines changed: 16 additions & 16 deletions

src/game/shared/swarm/asw_weapon_50calmg_shared.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ void CASW_Weapon_50CalMG::Precache()
8181

8282
const Vector& CASW_Weapon_50CalMG::GetBulletSpread( void )
8383
{
84-
static const Vector cone( 0.17365, 0.08716, 0.17365 ); // VECTOR_CONE_20DEGREES with flattened Y (vertical) from VECTOR_CONE_10DEGREES
85-
static const Vector cone_duck = Vector( 0.13053, 0.04362, 0.13053 ); // VECTOR_CONE_15DEGREES with flattened Y (vertical) from VECTOR_CONE_5DEGREES
84+
static const Vector cone( 0.17365, 0.08716, 0.17365 ); // VECTOR_CONE_20DEGREES with flattened Y (vertical) VECTOR_CONE_10DEGREES
85+
static const Vector cone_duck = Vector( 0.13053, 0.04362, 0.13053 ); // VECTOR_CONE_15DEGREES with flattened Y (vertical) ECTOR_CONE_5DEGREES
8686

8787
CASW_Marine* marine = GetMarine();
8888

src/game/shared/swarm/asw_weapon_autogun_shared.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ int CASW_Weapon_Autogun::GetWeaponSubSkillId()
177177

178178
const Vector& CASW_Weapon_Autogun::GetBulletSpread( void )
179179
{
180-
static const Vector cone = Vector( 0.06105, 0.02, 0.06105 ); // VECTOR_CONE_7DEGREES with flattened Y (vertical)
181-
static const Vector cone_duck = Vector( 0.03490, 0.01, 0.03490 ); // VECTOR_CONE_4DEGREES with flattened Y (vertical)
180+
static const Vector cone = Vector( 0.06105, 0.02618, 0.06105 ); // VECTOR_CONE_7DEGREES with flattened Y (vertical) VECTOR_CONE_3DEGREES
181+
static const Vector cone_duck = Vector( 0.03490, 0.00873, 0.03490 ); // VECTOR_CONE_4DEGREES with flattened Y (vertical) VECTOR_CONE_1DEGREES
182182

183183
CASW_Marine *marine = GetMarine();
184184

src/game/shared/swarm/asw_weapon_deagle_shared.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ void CASW_Weapon_DEagle::ItemBusyFrame()
175175

176176
const Vector &CASW_Weapon_DEagle::GetBulletSpread( void )
177177
{
178-
const static Vector cone = Vector( 0.13053, 0.02, 0.13053 ); // VECTOR_CONE_15DEGREES with flattened Y (vertical)
179-
const static Vector cone_duck = Vector( 0.05234, 0.01, 0.05234 ); // VECTOR_CONE_6DEGREES with flattened Y (vertical)
178+
static const Vector cone = Vector( 0.13053, 0.02618, 0.13053 ); // VECTOR_CONE_15DEGREES with flattened Y (vertical) VECTOR_CONE_3DEGREES
179+
static const Vector cone_duck = Vector( 0.05234, 0.00873, 0.05234 ); // VECTOR_CONE_6DEGREES with flattened Y (vertical) VECTOR_CONE_1DEGREES
180180

181181
CASW_Marine *marine = GetMarine();
182182

src/game/shared/swarm/asw_weapon_heavy_rifle_shared.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ float CASW_Weapon_Heavy_Rifle::GetFireRate()
153153

154154
const Vector &CASW_Weapon_Heavy_Rifle::GetBulletSpread( void )
155155
{
156-
const static Vector cone = Vector( 0.13053, 0.02, 0.13053 ); // VECTOR_CONE_15DEGREES with flattened Y (vertical)
157-
const static Vector cone_duck = Vector( 0.05234, 0.01, 0.05234 ); // VECTOR_CONE_6DEGREES with flattened Y (vertical)
156+
static const Vector cone = Vector( 0.13053, 0.02618, 0.13053 ); // VECTOR_CONE_15DEGREES with flattened Y (vertical) VECTOR_CONE_3DEGREES
157+
static const Vector cone_duck = Vector( 0.05234, 0.00873, 0.05234 ); // VECTOR_CONE_6DEGREES with flattened Y (vertical) VECTOR_CONE_1DEGREES
158158

159159
CASW_Marine *marine = GetMarine();
160160

src/game/shared/swarm/asw_weapon_medrifle_shared.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,8 +347,8 @@ void CASW_Weapon_MedRifle::WeaponIdle( void )
347347

348348
const Vector& CASW_Weapon_MedRifle::GetBulletSpread( void )
349349
{
350-
static const Vector cone = Vector( 0.13053, 0.02, 0.13053 ); // VECTOR_CONE_15DEGREES with flattened Y (vertical)
351-
const static Vector cone_duck = Vector( 0.05234, 0.01, 0.05234 ); // VECTOR_CONE_6DEGREES with flattened Y (vertical)
350+
static const Vector cone = Vector( 0.13053, 0.02618, 0.13053 ); // VECTOR_CONE_15DEGREES with flattened Y (vertical) VECTOR_CONE_3DEGREES
351+
static const Vector cone_duck = Vector( 0.05234, 0.00873, 0.05234 ); // VECTOR_CONE_6DEGREES with flattened Y (vertical) VECTOR_CONE_1DEGREES
352352

353353
CASW_Marine* marine = GetMarine();
354354

src/game/shared/swarm/asw_weapon_minigun.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,8 +442,8 @@ int CASW_Weapon_Minigun::GetWeaponSubSkillId()
442442

443443
const Vector &CASW_Weapon_Minigun::GetBulletSpread( void )
444444
{
445-
const static Vector cone = Vector( 0.13053, 0.02, 0.13053 ); // VECTOR_CONE_15DEGREES with flattened Y (vertical)
446-
const static Vector cone_duck = Vector( 0.05234, 0.01, 0.05234 ); // VECTOR_CONE_6DEGREES with flattened Y (vertical)
445+
const static Vector cone = Vector( 0.13053, 0.02618, 0.13053 ); // VECTOR_CONE_15DEGREES with flattened Y (vertical) VECTOR_CONE_3DEGREES
446+
const static Vector cone_duck = Vector( 0.05234, 0.00873, 0.05234 ); // VECTOR_CONE_6DEGREES with flattened Y (vertical) VECTOR_CONE_1DEGREES
447447

448448
CASW_Marine *marine = GetMarine();
449449

src/game/shared/swarm/asw_weapon_shotgun_shared.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ CASW_Weapon_Shotgun::~CASW_Weapon_Shotgun()
141141

142142
const Vector& CASW_Weapon_Shotgun::GetBulletSpread( void )
143143
{
144-
static const Vector cone = Vector( 0.17365, 0.02, 0.17365 ); // VECTOR_CONE_20DEGREES with flattened Y (vertical)
145-
static const Vector cone_duck = Vector( 0.05234, 0.01, 0.05234 ); // VECTOR_CONE_6DEGREES with flattened Y (vertical)
144+
static const Vector cone = Vector( 0.17365, 0.08716, 0.17365 ); // VECTOR_CONE_20DEGREES with flattened Y (vertical) VECTOR_CONE_10DEGREES
145+
static const Vector cone_duck = Vector( 0.13053, 0.04362, 0.13053 ); // VECTOR_CONE_15DEGREES with flattened Y (vertical) VECTOR_CONE_5DEGREES
146146

147147
CASW_Marine* marine = GetMarine();
148148

@@ -156,8 +156,8 @@ const Vector& CASW_Weapon_Shotgun::GetBulletSpread( void )
156156

157157
const Vector& CASW_Weapon_Shotgun::GetAngularBulletSpread( void )
158158
{
159-
static const Vector cone( 12, 22, 12 ); // VECTOR CONE 22 degrees with flattened X/Z (vertical) 12 degrees
160-
static const Vector cone_duck( 6, 16, 6 ); // VECTOR CONE 22 degrees with flattened X/Z (vertical) 06 degrees
159+
static const Vector cone( 12, 22, 12 ); // VECTOR CONE 22 degrees with flattened X/Z (vertical) 12 degrees
160+
static const Vector cone_duck( 6, 16, 6 ); // VECTOR CONE 22 degrees with flattened X/Z (vertical) 06 degrees
161161

162162
CASW_Marine* marine = GetMarine();
163163

0 commit comments

Comments
 (0)