summaryrefslogtreecommitdiffstats
path: root/src/objects
diff options
context:
space:
mode:
Diffstat (limited to 'src/objects')
-rw-r--r--src/objects/CutsceneObject.cpp3
-rw-r--r--src/objects/CutsceneObject.h1
-rw-r--r--src/objects/Object.h1
-rw-r--r--src/objects/ParticleObject.cpp11
-rw-r--r--src/objects/ParticleObject.h5
5 files changed, 19 insertions, 2 deletions
diff --git a/src/objects/CutsceneObject.cpp b/src/objects/CutsceneObject.cpp
index 7d9fe640..803fcf0f 100644
--- a/src/objects/CutsceneObject.cpp
+++ b/src/objects/CutsceneObject.cpp
@@ -53,12 +53,15 @@ CCutsceneObject::SetModelIndex(uint32 id)
void
CCutsceneObject::CreateShadow(void)
{
+ // empty in LCS
+ /*
if ( IsPedModel(GetModelIndex()) )
{
m_pShadow = new CCutsceneShadow();
if (!m_pShadow->IsInitialized())
m_pShadow->Create(m_rwObject, 6, true, 4, true);
}
+ */
}
void
diff --git a/src/objects/CutsceneObject.h b/src/objects/CutsceneObject.h
index af24c0a6..b0659c08 100644
--- a/src/objects/CutsceneObject.h
+++ b/src/objects/CutsceneObject.h
@@ -14,6 +14,7 @@ public:
CCutsceneObject(void);
~CCutsceneObject(void);
+ bool UpdatesInCutscene(void) { return true; }
void SetModelIndex(uint32 id);
void CreateShadow(void);
void ProcessControl(void);
diff --git a/src/objects/Object.h b/src/objects/Object.h
index f59379bf..a535732c 100644
--- a/src/objects/Object.h
+++ b/src/objects/Object.h
@@ -71,6 +71,7 @@ public:
uint8 bIsWeapon : 1;
uint8 bIsStreetLight : 1;
int8 m_nBonusValue;
+ int8 m_nLastWeaponToDamage;
uint16 m_nCostValue;
float m_fCollisionDamageMultiplier;
uint8 m_nCollisionDamageEffect;
diff --git a/src/objects/ParticleObject.cpp b/src/objects/ParticleObject.cpp
index 28c5240f..c49044a0 100644
--- a/src/objects/ParticleObject.cpp
+++ b/src/objects/ParticleObject.cpp
@@ -248,6 +248,16 @@ CParticleObject::AddObject(uint16 type, CVector const &pos, CVector const &targe
break;
}
+ case POBJECT_FIRE_HYDRANT_STEAM:
+ {
+ pobj->m_ParticleType = PARTICLE_HYDRANT_STEAM;
+ pobj->m_nNumEffectCycles = 2;
+ pobj->m_nSkipFrames = 2;
+ pobj->m_nCreationChance = 8;
+ pobj->m_nRemoveTimer = CTimer::GetTimeInMilliseconds() + 5000;
+ break;
+ }
+
case POBJECT_CAR_WATER_SPLASH:
case POBJECT_PED_WATER_SPLASH:
{
@@ -927,6 +937,7 @@ void CParticleObject::UpdateClose(void)
CParticle::AddParticle(PARTICLE_CAR_SPLASH, splashpos, splashvel, nil,
CGeneral::GetRandomNumberInRange(0.005f, 0.0075f), this->m_Color, 0, 0, 1, 300);
}
+
for ( int32 i = 0; i < this->m_nNumEffectCycles; i++ )
{
CParticle::AddParticle(this->m_ParticleType, pos, vel, nil, 0.0f, this->m_Color);
diff --git a/src/objects/ParticleObject.h b/src/objects/ParticleObject.h
index f199e533..1ac29451 100644
--- a/src/objects/ParticleObject.h
+++ b/src/objects/ParticleObject.h
@@ -15,6 +15,7 @@ enum eParticleObjectType
POBJECT_WALL_STEAM_SLOWMOTION,
POBJECT_DARK_SMOKE,
POBJECT_FIRE_HYDRANT,
+ POBJECT_FIRE_HYDRANT_STEAM,
POBJECT_CAR_WATER_SPLASH,
POBJECT_PED_WATER_SPLASH,
POBJECT_SPLASHES_AROUND,
@@ -49,7 +50,7 @@ public:
CParticleObject *m_pNext;
CParticleObject *m_pPrev;
CParticle *m_pParticle;
- uint32 m_nRemoveTimer;
+ uint32 m_nRemoveTimer;
eParticleObjectType m_Type;
tParticleType m_ParticleType;
uint8 m_nNumEffectCycles;
@@ -109,4 +110,4 @@ public:
static void Remove(CParticleObject *particleobject);
static CAudioHydrant *Get(int n); // for neo screen droplets
-}; \ No newline at end of file
+};