summaryrefslogtreecommitdiffstats
path: root/src/core/Fire.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-13 16:55:12 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-13 16:55:12 +0200
commitd4265884966496f3e1ab64cb61097555e43a549c (patch)
tree960d3b27ea4f34958599bfc26fe3dc07e34f03ba /src/core/Fire.cpp
parentped attractor: start (diff)
parentMerge branch 'master' into miami (diff)
downloadre3-d4265884966496f3e1ab64cb61097555e43a549c.tar
re3-d4265884966496f3e1ab64cb61097555e43a549c.tar.gz
re3-d4265884966496f3e1ab64cb61097555e43a549c.tar.bz2
re3-d4265884966496f3e1ab64cb61097555e43a549c.tar.lz
re3-d4265884966496f3e1ab64cb61097555e43a549c.tar.xz
re3-d4265884966496f3e1ab64cb61097555e43a549c.tar.zst
re3-d4265884966496f3e1ab64cb61097555e43a549c.zip
Diffstat (limited to 'src/core/Fire.cpp')
-rw-r--r--src/core/Fire.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/Fire.cpp b/src/core/Fire.cpp
index 65b6deb2..933c73da 100644
--- a/src/core/Fire.cpp
+++ b/src/core/Fire.cpp
@@ -128,7 +128,7 @@ CFire::ProcessFire(void)
lightpos.z = m_vecPos.z + 5.0f;
if (!m_pEntity) {
- CShadows::StoreStaticShadow((uint32)this, SHADOWTYPE_ADDITIVE, gpShadowExplosionTex, &lightpos,
+ CShadows::StoreStaticShadow((uintptr)this, SHADOWTYPE_ADDITIVE, gpShadowExplosionTex, &lightpos,
7.0f, 0.0f, 0.0f, -7.0f,
255, // this is 0 on PC which results in no shadow
nRandNumber / 2, nRandNumber / 2, 0,
@@ -199,7 +199,7 @@ CFireManager::StartFire(CEntity *entityOnFire, CEntity *fleeFrom, float strength
{
CPed *ped = (CPed *)entityOnFire;
CVehicle *veh = (CVehicle *)entityOnFire;
-
+
if (entityOnFire->IsPed()) {
if (ped->m_pFire)
return nil;
@@ -212,7 +212,7 @@ CFireManager::StartFire(CEntity *entityOnFire, CEntity *fleeFrom, float strength
return nil;
}
CFire *fire = GetNextFreeFire();
-
+
if (fire) {
if (entityOnFire->IsPed()) {
ped->m_pFire = fire;
@@ -243,7 +243,7 @@ CFireManager::StartFire(CEntity *entityOnFire, CEntity *fleeFrom, float strength
veh->m_pCarFire = fire;
if (fleeFrom) {
CEventList::RegisterEvent(EVENT_CAR_SET_ON_FIRE, EVENT_ENTITY_VEHICLE,
- entityOnFire, (CPed *)fleeFrom, 10000);
+ entityOnFire, (CPed *)fleeFrom, 10000);
}
}
}