summaryrefslogtreecommitdiffstats
path: root/src/peds/Ped.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-05-12 23:19:21 +0200
committerSergeanur <s.anureev@yandex.ua>2020-05-12 23:27:15 +0200
commit33dfaf7da11675fdad2909e39b6d15e49fc6cc68 (patch)
treeff2b3fe079b51b521cb26ceb2da0a5717b0601ff /src/peds/Ped.cpp
parentMerge remote-tracking branch 'upstream/miami' into miami (diff)
parentfix shotgun (diff)
downloadre3-33dfaf7da11675fdad2909e39b6d15e49fc6cc68.tar
re3-33dfaf7da11675fdad2909e39b6d15e49fc6cc68.tar.gz
re3-33dfaf7da11675fdad2909e39b6d15e49fc6cc68.tar.bz2
re3-33dfaf7da11675fdad2909e39b6d15e49fc6cc68.tar.lz
re3-33dfaf7da11675fdad2909e39b6d15e49fc6cc68.tar.xz
re3-33dfaf7da11675fdad2909e39b6d15e49fc6cc68.tar.zst
re3-33dfaf7da11675fdad2909e39b6d15e49fc6cc68.zip
Diffstat (limited to 'src/peds/Ped.cpp')
-rw-r--r--src/peds/Ped.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 65bd168e..8cf52e91 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -2862,7 +2862,7 @@ CPed::SetObjective(eObjective newObj, void *entity)
case OBJECTIVE_WAIT_IN_CAR_THEN_GETOUT:
// In this special case, entity parameter isn't CEntity, but int.
- SetObjectiveTimer((int)entity);
+ SetObjectiveTimer((uintptr)entity);
break;
case OBJECTIVE_KILL_CHAR_ON_FOOT:
case OBJECTIVE_KILL_CHAR_ANY_MEANS:
@@ -3355,7 +3355,7 @@ CPed::MakePhonecall(void)
if (!IsPlayer() && CTimer::GetTimeInMilliseconds() > m_phoneTalkTimer - 7000 && bRunningToPhone) {
FindPlayerPed()->m_pWanted->RegisterCrime_Immediately(m_crimeToReportOnPhone, GetPosition(),
- (m_crimeToReportOnPhone == CRIME_POSSESSION_GUN ? (int)m_threatEntity : (int)((CPed*)m_pEventEntity)->m_threatEntity), false);
+ (m_crimeToReportOnPhone == CRIME_POSSESSION_GUN ? (uintptr)m_threatEntity : (uintptr)((CPed*)m_pEventEntity)->m_threatEntity), false);
bRunningToPhone = false;
}
#endif
@@ -4563,7 +4563,7 @@ CPed::SetPointGunAt(CEntity *to)
SetLookFlag(to, true);
SetAimFlag(to);
#ifdef VC_PED_PORTS
- SetLookTimer(INT_MAX);
+ SetLookTimer(INT32_MAX);
#endif
}
@@ -4802,8 +4802,8 @@ CPed::SetEvasiveDive(CPhysical *reason, uint8 onlyRandomJump)
if (reason->IsVehicle() && m_nPedType == PEDTYPE_COP) {
if (veh->pDriver && veh->pDriver->IsPlayer()) {
CWanted *wanted = FindPlayerPed()->m_pWanted;
- wanted->RegisterCrime_Immediately(CRIME_RECKLESS_DRIVING, GetPosition(), (int)this, false);
- wanted->RegisterCrime_Immediately(CRIME_SPEEDING, GetPosition(), (int)this, false);
+ wanted->RegisterCrime_Immediately(CRIME_RECKLESS_DRIVING, GetPosition(), (uintptr)this, false);
+ wanted->RegisterCrime_Immediately(CRIME_SPEEDING, GetPosition(), (uintptr)this, false);
}
}
}