summaryrefslogtreecommitdiffstats
path: root/src/peds
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-11-02 13:57:58 +0100
committeraap <aap@papnet.eu>2020-11-02 13:57:58 +0100
commit8acc98563e26e393f8bf8be3575782aba13e6d1b (patch)
tree3372bebac52d71cd033245971955e87fa5502ed4 /src/peds
parentbike bug (diff)
parentfix (diff)
downloadre3-8acc98563e26e393f8bf8be3575782aba13e6d1b.tar
re3-8acc98563e26e393f8bf8be3575782aba13e6d1b.tar.gz
re3-8acc98563e26e393f8bf8be3575782aba13e6d1b.tar.bz2
re3-8acc98563e26e393f8bf8be3575782aba13e6d1b.tar.lz
re3-8acc98563e26e393f8bf8be3575782aba13e6d1b.tar.xz
re3-8acc98563e26e393f8bf8be3575782aba13e6d1b.tar.zst
re3-8acc98563e26e393f8bf8be3575782aba13e6d1b.zip
Diffstat (limited to 'src/peds')
-rw-r--r--src/peds/Ped.cpp14
-rw-r--r--src/peds/Ped.h1
2 files changed, 15 insertions, 0 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 03c0bf2c..15eb79b6 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -21440,3 +21440,17 @@ CPed::SetLook(float direction)
SetLookFlag(direction, false);
}
}
+
+// --MIAMI: Done
+// Unused
+void CPed::PedSetGetInCarPositionCB(CAnimBlendAssociation* assoc, void* arg)
+{
+ CPed* pPed = (CPed*)arg;
+ CMatrix mat(pPed->GetMatrix());
+ CVehicle* pVehicle = pPed->m_pMyVehicle;
+ const CVector& offset = (pVehicle->bIsVan && (pPed->m_vehEnterType == CAR_DOOR_RR || pPed->m_vehEnterType == CAR_DOOR_LR)) ? vecPedVanRearDoorAnimOffset : vecPedCarDoorAnimOffset;
+ CVector position = Multiply3x3(mat, offset) + pPed->GetPosition();
+ CPedPlacement::FindZCoorForPed(&position);
+ pPed->SetMoveSpeed(0.0f, 0.0f, 0.0f);
+ pPed->SetPosition(position);
+}
diff --git a/src/peds/Ped.h b/src/peds/Ped.h
index 1f0e9243..aa0a69db 100644
--- a/src/peds/Ped.h
+++ b/src/peds/Ped.h
@@ -911,6 +911,7 @@ public:
static void DeleteSunbatheIdleAnimCB(CAnimBlendAssociation *assoc, void *arg);
static void PedSetPreviousStateCB(CAnimBlendAssociation *assoc, void *arg);
static void PedAnimShuffleCB(CAnimBlendAssociation *assoc, void *arg);
+ static void PedSetGetInCarPositionCB(CAnimBlendAssociation* assoc, void* arg);
bool IsPlayer(void);
bool IsFemale(void) { return m_nPedType == PEDTYPE_CIVFEMALE || m_nPedType == PEDTYPE_PROSTITUTE; }