summaryrefslogtreecommitdiffstats
path: root/src/vehicles
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-07-29 09:34:28 +0200
committeraap <aap@papnet.eu>2020-07-29 09:34:28 +0200
commitfb4de46626b00079e169da562a0267126c1c1340 (patch)
tree30afeb6ed4245493dc7b8c87a52eb8b7c84e8c49 /src/vehicles
parentCCollision done and fixes (diff)
parentMerge pull request #667 from erorcun/miami (diff)
downloadre3-fb4de46626b00079e169da562a0267126c1c1340.tar
re3-fb4de46626b00079e169da562a0267126c1c1340.tar.gz
re3-fb4de46626b00079e169da562a0267126c1c1340.tar.bz2
re3-fb4de46626b00079e169da562a0267126c1c1340.tar.lz
re3-fb4de46626b00079e169da562a0267126c1c1340.tar.xz
re3-fb4de46626b00079e169da562a0267126c1c1340.tar.zst
re3-fb4de46626b00079e169da562a0267126c1c1340.zip
Diffstat (limited to 'src/vehicles')
-rw-r--r--src/vehicles/Heli.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vehicles/Heli.cpp b/src/vehicles/Heli.cpp
index 408fb8f9..00bb0023 100644
--- a/src/vehicles/Heli.cpp
+++ b/src/vehicles/Heli.cpp
@@ -731,12 +731,12 @@ CHeli::SendDownSwat(void)
float groundZ = CWorld::FindGroundZFor3DCoord(pos.x, pos.y, pos.z, nil);
if(Abs(FindPlayerCoors().z - groundZ) < 2.5f && CRopes::RegisterRope((uintptr)this + m_numSwat-1, pos, false)){
- CCopPed *swat = (CCopPed*)CPopulation::AddPed(PEDTYPE_COP, COP_ARMY, pos);
+ CCopPed *swat = (CCopPed*)CPopulation::AddPed(PEDTYPE_COP, COP_HELI_SWAT, pos);
swat->bUsesCollision = false;
swat->m_pRopeEntity = this;
RegisterReference(&swat->m_pRopeEntity);
m_numSwat--;
- swat->m_nRopeID = m_numSwat;
+ swat->m_nRopeID = (uintptr)this + m_numSwat;
m_aSwatState[m_numSwat] = 255;
CAnimManager::BlendAnimation(swat->GetClump(), ASSOCGRP_STD, ANIM_ABSEIL, 4.0f);
return true;