summaryrefslogtreecommitdiffstats
path: root/src/objects
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-09-01 20:10:35 +0200
committereray orçunus <erayorcunus@gmail.com>2020-09-01 20:10:35 +0200
commit16e10d788a12b12300c2232eeb5513b6df5233b5 (patch)
treeb98206f10d38401b3124e9d1249f8feb33307ade /src/objects
parentMerge pull request #700 from Sergeanur/VC/Stinger (diff)
downloadre3-16e10d788a12b12300c2232eeb5513b6df5233b5.tar
re3-16e10d788a12b12300c2232eeb5513b6df5233b5.tar.gz
re3-16e10d788a12b12300c2232eeb5513b6df5233b5.tar.bz2
re3-16e10d788a12b12300c2232eeb5513b6df5233b5.tar.lz
re3-16e10d788a12b12300c2232eeb5513b6df5233b5.tar.xz
re3-16e10d788a12b12300c2232eeb5513b6df5233b5.tar.zst
re3-16e10d788a12b12300c2232eeb5513b6df5233b5.zip
Diffstat (limited to 'src/objects')
-rw-r--r--src/objects/Stinger.cpp3
-rw-r--r--src/objects/Stinger.h18
2 files changed, 11 insertions, 10 deletions
diff --git a/src/objects/Stinger.cpp b/src/objects/Stinger.cpp
index d0e6919f..7996db00 100644
--- a/src/objects/Stinger.cpp
+++ b/src/objects/Stinger.cpp
@@ -51,6 +51,7 @@ CStinger::Init(CPed *pPed)
}
bIsDeployed = true;
m_vPos = pPed->GetPosition();
+ m_vPos.z -= 1.0f;
m_fMax_Z = Atan2(-pPed->GetForward().x, pPed->GetForward().y) + HALFPI;
for (i = 0; i < NUM_STINGER_SEGMENTS; i++) {
@@ -61,7 +62,7 @@ CStinger::Init(CPed *pPed)
CVector2D fwd2d(pPed->GetForward().x, pPed->GetForward().y);
for (i = 0; i < ARRAY_SIZE(m_vPositions); i++)
- m_vPositions[i] = fwd2d * Sin(DEGTORAD(i));
+ m_vPositions[i] = fwd2d * 1.8f * Sin(DEGTORAD(i));
m_nSpikeState = STINGERSTATE_NONE;
m_nTimeOfDeploy = CTimer::GetTimeInMilliseconds();
diff --git a/src/objects/Stinger.h b/src/objects/Stinger.h
index d1b57ce7..250cf62d 100644
--- a/src/objects/Stinger.h
+++ b/src/objects/Stinger.h
@@ -11,16 +11,17 @@ public:
#define NUM_STINGER_SEGMENTS (12)
+enum {
+ STINGERSTATE_NONE = 0,
+ STINGERSTATE_DEPLOYING,
+ STINGERSTATE_DEPLOYED,
+ STINGERSTATE_UNDEPLOYING,
+ STINGERSTATE_REMOVE,
+};
+
class CStinger
{
- enum {
- STINGERSTATE_NONE = 0,
- STINGERSTATE_DEPLOYING,
- STINGERSTATE_DEPLOYED,
- STINGERSTATE_UNDEPLOYING,
- STINGERSTATE_REMOVE,
- };
-
+public:
bool bIsDeployed;
uint32 m_nTimeOfDeploy;
CVector m_vPos;
@@ -30,7 +31,6 @@ class CStinger
CStingerSegment *pSpikes[NUM_STINGER_SEGMENTS];
class CPed *pOwner;
uint8 m_nSpikeState;
-public:
CStinger();
void Init(CPed *pPed);
void Remove();