1 files changed, 1117 insertions, 10 deletions

diff --git a/src/objects/ParticleObject.cpp b/src/objects/ParticleObject.cpp
index f5cd4c94..32d305c6 100644
--- a/src/objects/ParticleObject.cpp
+++ b/src/objects/ParticleObject.cpp
@@ -1,30 +1,1137 @@
 #include "common.h"
 #include "patcher.h"
 #include "ParticleObject.h"
+#include "Timer.h"
+#include "General.h"
+#include "ParticleMgr.h"
+#include "Particle.h"
+#include "Camera.h"
+#include "Game.h"
 
-WRAPPER void CParticleObject::AddObject(uint16 type, const CVector &pos, uint8 remove) { EAXJMP(0x4BC4D0); }
-WRAPPER void CParticleObject::AddObject(uint16 type, const CVector &pos, float size, uint8 remove) { EAXJMP(0x4BC520); }
-WRAPPER void CParticleObject::AddObject(uint16 type, const CVector &pos, const CVector &dir, float size, uint8 remove) { EAXJMP(0x4BC570); }
-WRAPPER void CParticleObject::AddObject(uint16 type, const CVector &pos, const CVector &dir, float size, uint32, const RwRGBA &col, uint8 remove) { EAXJMP(0x4BC5B0); }
 
-// Converted from static void __cdecl CParticleObject::Initialise() 0x42C760
-void CParticleObject::Initialise()
+CParticleObject (&gPObjectArray)[MAX_PARTICLEOBJECTS] = *(CParticleObject(*)[MAX_PARTICLEOBJECTS])int(0x62A58C);
+
+CParticleObject *&CParticleObject::pCloseListHead = *(CParticleObject **)int(0x8F4340);
+CParticleObject *&CParticleObject::pFarListHead = *(CParticleObject **)int(0x942F78);
+CParticleObject *&CParticleObject::pUnusedListHead = *(CParticleObject **)int(0x94128C);
+
+CAudioHydrant List[MAX_AUDIOHYDRANTS];
+
+bool
+CAudioHydrant::Add(CParticleObject *particleobject)
 {
-	((void (__cdecl *)())0x4BC440)();
+	for ( int32 i = 0; i < MAX_AUDIOHYDRANTS; i++ )
+	{
+		if ( List[i].AudioEntity == AEHANDLE_NONE )
+		{
+			List[i].AudioEntity = DMAudio.CreateEntity(AUDIOTYPE_FIREHYDRANT, particleobject);
+
+			if ( AEHANDLE_IS_FAILED(List[i].AudioEntity) )
+				return false;
+			
+			DMAudio.SetEntityStatus(List[i].AudioEntity, true);
+			
+			List[i].pParticleObject = particleobject;
+			
+			return true;
+		}
+	}
+	
+	return false;
 }
 
-// Converted from static void __cdecl CParticleObject::UpdateAll() 0x4BCA30
-void CParticleObject::UpdateAll()
+void
+CAudioHydrant::Remove(CParticleObject *particleobject)
 {
-	((void (__cdecl *)())0x4BCA30)();
+	for ( int32 i = 0; i < MAX_AUDIOHYDRANTS; i++ )
+	{
+		if ( List[i].pParticleObject == particleobject )
+		{
+			DMAudio.DestroyEntity(List[i].AudioEntity);
+			List[i].AudioEntity = AEHANDLE_NONE;
+			List[i].pParticleObject = NULL;
+		}
+	}
+}
+
+CParticleObject::CParticleObject() :
+	CPlaceable(),
+	m_nFrameCounter(0),
+	m_nState(POBJECTSTATE_INITIALISED),
+	m_pNext(NULL),
+	m_pPrev(NULL),
+	m_nRemoveTimer(NULL)
+	
+{
+	;
+}
+
+CParticleObject::~CParticleObject()
+{
+	
+}
+
+void
+CParticleObject::Initialise()
+{
+	pCloseListHead = NULL;
+	pFarListHead   = NULL;
+	
+	pUnusedListHead = &gPObjectArray[0];
+	
+	for ( int32 i = 0; i < MAX_PARTICLEOBJECTS; i++ )
+	{
+		if ( i == 0 )
+			gPObjectArray[i].m_pPrev = NULL;
+		else
+			gPObjectArray[i].m_pPrev = &gPObjectArray[i - 1];
+		
+		if ( i == MAX_PARTICLEOBJECTS-1 )
+			gPObjectArray[i].m_pNext = NULL;
+		else
+			gPObjectArray[i].m_pNext = &gPObjectArray[i + 1];
+		
+		gPObjectArray[i].m_nState = POBJECTSTATE_FREE;
+	}
+}
+
+CParticleObject *
+CParticleObject::AddObject(uint16 type, CVector const &pos, uint8 remove)
+{
+	CRGBA color(0, 0, 0, 0);
+	CVector target(0.0f, 0.0f, 0.0f);
+	return AddObject(type, pos, target, 0.0f, 0, color, remove);
+}
+
+CParticleObject *
+CParticleObject::AddObject(uint16 type, CVector const &pos, float size, uint8 remove)
+{
+	CRGBA color(0, 0, 0, 0);
+	CVector target(0.0f, 0.0f, 0.0f);
+	return AddObject(type, pos, target, size, 0, color, remove);
+}
+
+CParticleObject *
+CParticleObject::AddObject(uint16 type, CVector const &pos, CVector const &target, float size, uint8 remove)
+{
+	CRGBA color(0, 0, 0, 0);
+	return AddObject(type, pos, target, size, 0, color, remove);
+}
+
+CParticleObject *
+CParticleObject::AddObject(uint16 type, CVector const &pos, CVector const &target, float size, uint32 lifeTime, RwRGBA const &color, uint8 remove)
+{
+	CParticleObject *pobj = pUnusedListHead;
+	
+	ASSERT(pobj != NULL);
+	
+	if ( pobj == NULL )
+	{
+		printf("Error: No particle objects available!\n");
+		return NULL;
+	}
+	
+	MoveToList(&pUnusedListHead, &pCloseListHead, pobj);
+	
+	pobj->m_nState           = POBJECTSTATE_UPDATE_CLOSE;
+	pobj->m_Type             = (eParticleObjectType)type;
+	
+	pobj->GetPosition()      = pos;
+	pobj->m_vecTarget        = target;
+	
+	pobj->m_nNumEffectCycles = 1;
+	pobj->m_nSkipFrames      = 1;
+	pobj->m_nCreationChance  = 0;
+	pobj->m_nFrameCounter    = 0;
+	
+	pobj->m_bRemove          = remove;
+	
+	pobj->m_pParticle        = NULL;
+	
+	if ( lifeTime != 0 )
+		pobj->m_nRemoveTimer = CTimer::GetTimeInMilliseconds() + lifeTime;
+	else
+		pobj->m_nRemoveTimer = 0;
+	
+	if ( color.alpha != 0 )
+		RwRGBAAssign(&pobj->m_Color, &color);
+	else
+		pobj->m_Color.alpha  = 0;
+	
+	pobj->m_fSize            = size;
+	pobj->m_fRandVal         = 0.0f;
+	
+	if ( type <= POBJECT_CATALINAS_SHOTGUNFLASH )
+	{
+		switch ( type )
+		{
+			case POBJECT_PAVEMENT_STEAM:
+			{
+				pobj->m_ParticleType     = PARTICLE_STEAM_NY;
+				pobj->m_nNumEffectCycles = 1;
+				pobj->m_nSkipFrames      = 3;
+				pobj->m_nCreationChance  = 8;
+				break;
+			}
+			
+			case POBJECT_PAVEMENT_STEAM_SLOWMOTION:
+			{
+				pobj->m_ParticleType     = PARTICLE_STEAM_NY_SLOWMOTION;
+				pobj->m_nNumEffectCycles = 1;
+				pobj->m_nSkipFrames      = 1;
+				pobj->m_nCreationChance  = 8;
+				break;
+			}
+			
+			case POBJECT_WALL_STEAM:
+			{
+				pobj->m_ParticleType     = PARTICLE_STEAM_NY;
+				pobj->m_nNumEffectCycles = 1;
+				pobj->m_nSkipFrames      = 3;
+				pobj->m_nCreationChance  = 8;
+				break;
+			}
+			
+			case POBJECT_WALL_STEAM_SLOWMOTION:
+			{
+				pobj->m_ParticleType     = PARTICLE_STEAM_NY_SLOWMOTION;
+				pobj->m_nNumEffectCycles = 1;
+				pobj->m_nSkipFrames      = 1;
+				pobj->m_nCreationChance  = 8;
+				break;
+			}
+			
+			case POBJECT_DARK_SMOKE:
+			{
+				pobj->m_ParticleType     = PARTICLE_STEAM_NY;
+				pobj->m_nNumEffectCycles = 1;
+				pobj->m_nSkipFrames      = 3;
+				pobj->m_nCreationChance  = 8;
+				pobj->m_Color            = CRGBA(16, 16, 16, 255);
+				break;
+			}
+			
+			case POBJECT_FIRE_HYDRANT:
+			{
+				pobj->m_ParticleType     = PARTICLE_WATER_HYDRANT;
+				pobj->m_nNumEffectCycles = 4;
+				pobj->m_nSkipFrames      = 1;
+				pobj->m_nCreationChance  = 0;
+				pobj->m_vecTarget        = CVector(0.0f, 0.0f, 0.3f);
+				pobj->m_nRemoveTimer     = CTimer::GetTimeInMilliseconds() + 5000;
+				CAudioHydrant::Add(pobj);
+				break;
+			}
+			
+			case POBJECT_CAR_WATER_SPLASH:
+			case POBJECT_PED_WATER_SPLASH:
+			{
+				pobj->m_ParticleType     = PARTICLE_CAR_SPLASH;
+				pobj->m_nNumEffectCycles = 0;
+				pobj->m_nSkipFrames      = 1;
+				pobj->m_nCreationChance  = 0;
+				break;
+			}
+			
+			case POBJECT_SPLASHES_AROUND:
+			{
+				pobj->m_ParticleType     = PARTICLE_SPLASH;
+				pobj->m_nNumEffectCycles = 15;
+				pobj->m_nSkipFrames      = 2;
+				pobj->m_nCreationChance  = 0;
+				break;
+			}
+			
+			case POBJECT_SMALL_FIRE:
+			{
+				pobj->m_ParticleType     = PARTICLE_FLAME;
+				pobj->m_nNumEffectCycles = 1;
+				pobj->m_nSkipFrames      = 2;
+				pobj->m_nCreationChance  = 2;
+				pobj->m_vecTarget        = CVector(0.0f, 0.0f, 0.0f);
+				break;
+			}
+			
+			case POBJECT_BIG_FIRE:
+			{
+				pobj->m_ParticleType     = PARTICLE_FLAME;
+				pobj->m_nNumEffectCycles = 1;
+				pobj->m_nSkipFrames      = 2;
+				pobj->m_nCreationChance  = 4;
+				pobj->m_vecTarget        = CVector(0.0f, 0.0f, 0.0f);
+				break;
+			}
+			
+			case POBJECT_DRY_ICE:
+			{
+				pobj->m_ParticleType     = PARTICLE_SMOKE;
+				pobj->m_nNumEffectCycles = 1;
+				pobj->m_nSkipFrames      = 1;
+				pobj->m_nCreationChance  = 0;
+				pobj->m_vecTarget        = CVector(0.0f, 0.0f, 0.0f);
+				break;
+			}
+			
+			case POBJECT_DRY_ICE_SLOWMOTION:
+			{
+				pobj->m_ParticleType     = PARTICLE_SMOKE_SLOWMOTION;
+				pobj->m_nNumEffectCycles = 1;
+				pobj->m_nSkipFrames      = 1;
+				pobj->m_nCreationChance  = 0;
+				pobj->m_vecTarget        = CVector(0.0f, 0.0f, 0.0f);
+				break;
+			}
+			
+			case POBJECT_FIRE_TRAIL:
+			{
+				pobj->m_ParticleType     = PARTICLE_EXPLOSION_MEDIUM;
+				pobj->m_nNumEffectCycles = 1;
+				pobj->m_nSkipFrames      = 3;
+				pobj->m_nCreationChance  = 2;
+				pobj->m_fRandVal         = 0.01f;
+				break;
+			}
+			
+			case POBJECT_SMOKE_TRAIL:
+			{
+				pobj->m_ParticleType     = PARTICLE_FIREBALL_SMOKE;
+				pobj->m_nNumEffectCycles = 1;
+				pobj->m_nSkipFrames      = 1;
+				pobj->m_nCreationChance  = 2;
+				pobj->m_fRandVal         = 0.02f;
+				break;
+			}
+			
+			case POBJECT_FIREBALL_AND_SMOKE:
+			{
+				pobj->m_ParticleType     = PARTICLE_FLAME;
+				pobj->m_nNumEffectCycles = 1;
+				pobj->m_nSkipFrames      = 1;
+				pobj->m_nCreationChance  = 2;
+				pobj->m_fRandVal         = 0.1f;
+				break;
+			}
+			
+			case POBJECT_ROCKET_TRAIL:
+			{
+				pobj->m_ParticleType     = PARTICLE_FLAME;
+				pobj->m_nNumEffectCycles = 1;
+				pobj->m_nSkipFrames      = 2;
+				pobj->m_nCreationChance  = 8;
+				pobj->m_fRandVal         = 0.1f;
+				break;
+			}
+			
+			case POBJECT_EXPLOSION_ONCE:
+			{
+				pobj->m_ParticleType     = PARTICLE_EXPLOSION_LARGE;
+				pobj->m_nNumEffectCycles = 1;
+				pobj->m_nSkipFrames      = 1;
+				pobj->m_nCreationChance  = 0;
+				pobj->m_nRemoveTimer     = CTimer::GetTimeInMilliseconds();
+				break;
+			}
+			
+			case POBJECT_CATALINAS_GUNFLASH:
+			case POBJECT_CATALINAS_SHOTGUNFLASH:
+			{
+				pobj->m_ParticleType     = PARTICLE_GUNFLASH_NOANIM;
+				pobj->m_nNumEffectCycles = 1;
+				pobj->m_nSkipFrames      = 1;
+				pobj->m_nCreationChance  = 0;
+				pobj->m_nRemoveTimer     = CTimer::GetTimeInMilliseconds();
+				pobj->m_vecTarget.Normalise();
+				break;
+			}
+		}
+	}
+	
+	return pobj;
+}
+
+void
+CParticleObject::RemoveObject(void)
+{
+	switch ( this->m_nState )
+	{
+		case POBJECTSTATE_UPDATE_CLOSE:
+		{
+			MoveToList(&pCloseListHead, &pUnusedListHead, this);
+			this->m_nState = POBJECTSTATE_FREE;
+			break;
+		}
+		case POBJECTSTATE_UPDATE_FAR:
+		{
+			MoveToList(&pFarListHead, &pUnusedListHead, this);
+			this->m_nState = POBJECTSTATE_FREE;
+			break;
+		}
+	}
+}
+
+void
+CParticleObject::UpdateAll(void)
+{
+	{
+		CParticleObject *pobj = pCloseListHead;
+		CParticleObject *nextpobj;
+		if ( pobj != NULL )
+		{
+			do
+			{
+				nextpobj = pobj->m_pNext;
+				pobj->UpdateClose();
+				pobj = nextpobj;
+			}
+			while ( nextpobj != NULL );
+		}
+	}
+
+	{
+		int32 frame = CTimer::GetFrameCounter() & 31;
+		int32 counter = 0;
+	
+		CParticleObject *pobj = pFarListHead;
+		CParticleObject *nextpobj;
+		if ( pobj != NULL )
+		{
+			do
+			{
+				nextpobj = pobj->m_pNext;
+				
+				if ( counter == counter )
+				{
+					pobj->UpdateFar();
+					counter += 32;
+				}
+				
+				counter++;
+				
+				pobj = nextpobj;
+			}
+			while ( nextpobj != NULL );
+		}
+	}
+}
+
+void CParticleObject::UpdateClose(void)
+{
+	if ( !CGame::playingIntro )
+	{
+		if ( (this->GetPosition() - TheCamera.GetPosition()).MagnitudeSqr2D() > SQR(100.0f) )
+		{
+			if ( this->m_bRemove )
+			{
+				if ( this->m_Type == POBJECT_FIRE_HYDRANT )
+					CAudioHydrant::Remove(this);
+				
+				MoveToList(&pCloseListHead, &pUnusedListHead, this);
+				this->m_nState = POBJECTSTATE_FREE;
+			}
+			else
+			{
+				MoveToList(&pCloseListHead, &pFarListHead, this);
+				this->m_nState = POBJECTSTATE_UPDATE_FAR;
+			}
+			
+			return;
+		}
+	}
+	
+	if ( ++this->m_nFrameCounter >= this->m_nSkipFrames )
+    {
+		this->m_nFrameCounter = 0;
+		
+		int32 randVal; // BUG: unitialised can be used ??!!
+		if ( this->m_nCreationChance != 0 )
+			randVal = CGeneral::GetRandomNumber() % this->m_nCreationChance;
+		
+		if (   randVal != 0 && this->m_nCreationChance > 0
+			|| randVal == 0 && (this->m_nCreationChance & 128) != 0
+			|| this->m_nCreationChance == 0 )
+		{
+			switch ( this->m_Type )
+			{
+				case POBJECT_SMALL_FIRE:
+				{
+					CVector pos = this->GetPosition();
+					CVector vel = this->m_vecTarget;
+					float size  = this->m_fSize;
+					
+					CVector flamevel;
+					
+					flamevel.x = vel.x;
+					flamevel.y = vel.y;
+					flamevel.z = CGeneral::GetRandomNumberInRange(0.0125f*size, 0.1f*size);
+						
+					CParticle::AddParticle(PARTICLE_FLAME, pos, flamevel, NULL, size);
+					
+					
+					CVector possmoke = pos;
+					
+					possmoke.x += CGeneral::GetRandomNumberInRange(0.625f*-size, size*0.625f);
+					possmoke.y += CGeneral::GetRandomNumberInRange(0.625f*-size, size*0.625f);
+					possmoke.z += CGeneral::GetRandomNumberInRange(0.625f* size, size*2.5f);
+					
+					CParticle::AddParticle(PARTICLE_CARFLAME_SMOKE, possmoke, vel);
+            
+					break;
+				}
+				
+				case POBJECT_BIG_FIRE:
+				{
+					CVector pos = this->GetPosition();
+					CVector vel = this->m_vecTarget;
+					float size  = this->m_fSize;
+					
+					
+					float s = 0.7f*size;
+					
+					CVector flamevel;
+					
+					flamevel.x = vel.x;
+					flamevel.y = vel.y;
+					flamevel.z = CGeneral::GetRandomNumberInRange(0.0125f*s, 0.1f*s);
+					
+					float flamesize = 0.8f*size;
+					
+					CParticle::AddParticle(PARTICLE_FLAME, pos, flamevel, NULL, flamesize);
+					
+					
+					for ( int32 i = 0; i < 4; i++ )
+					{
+						CVector smokepos = pos;
+						
+						smokepos.x += CGeneral::GetRandomNumberInRange(0.625f*-size, 0.625f*size);
+						smokepos.y += CGeneral::GetRandomNumberInRange(0.625f*-size, 0.625f*size);
+						smokepos.z += CGeneral::GetRandomNumberInRange(0.625f* size, 3.5f  *size);
+						
+						CParticle::AddParticle(PARTICLE_CARFLAME_SMOKE, smokepos, vel);
+					}
+
+					break;
+				}
+				
+				case POBJECT_FIREBALL_AND_SMOKE:
+				{
+					if ( this->m_pParticle == NULL )
+					{
+						CVector pos = this->GetPosition();
+						CVector vel = this->m_vecTarget;
+						float size  = this->m_fSize;
+						
+						CVector expvel = 1.2f*vel;
+						float expsize  = 1.2f*size;
+						this->m_pParticle = CParticle::AddParticle(PARTICLE_EXPLOSION_MEDIUM, pos, expvel, NULL, expsize);
+					}
+					else
+					{
+						CVector pos = this->GetPosition(); // this->m_pParticle->m_vecPosition ?
+						CVector vel = this->m_vecTarget;
+						float size  = this->m_fSize;
+						
+						CVector veloffset   = 0.35f*vel;
+						CVector fireballvel = vel;
+						
+						for ( int32 i = 0; i < this->m_nNumEffectCycles; i++ )
+						{
+							fireballvel.x += CGeneral::GetRandomNumberInRange(-veloffset.x, veloffset.x);
+							fireballvel.y += CGeneral::GetRandomNumberInRange(-veloffset.y, veloffset.y);
+							fireballvel.z += CGeneral::GetRandomNumberInRange(-veloffset.z, veloffset.z);
+
+							CParticle::AddParticle(PARTICLE_FIREBALL_SMOKE, pos, fireballvel, NULL, size);
+						}
+					}
+					
+					break;
+				}
+				
+				case POBJECT_ROCKET_TRAIL:
+				{
+					if ( this->m_pParticle == NULL )
+					{
+						CVector pos = this->GetPosition();
+						CVector vel = this->m_vecTarget;
+						float size  = this->m_fSize;
+						
+						this->m_pParticle = CParticle::AddParticle(PARTICLE_EXPLOSION_MEDIUM, pos, vel, NULL, size);
+					}
+					else
+					{
+						CVector pos = this->m_pParticle->m_vecPosition;
+						CVector vel = this->m_vecTarget;
+						float size  = this->m_fSize;
+						
+						float fireballsize  = size * 1.5f;
+						CVector fireballvel = vel * -0.8f;
+						
+						for ( int32 i = 0; i < this->m_nNumEffectCycles; i++ )
+						{
+							CParticle::AddParticle(PARTICLE_FIREBALL_SMOKE, pos, fireballvel, NULL, fireballsize);
+						}
+					}
+					
+					break;
+				}
+				
+				case POBJECT_FIRE_TRAIL:
+				{
+					for ( int32 i = 0; i < this->m_nNumEffectCycles; i++ )
+					{
+						CVector vel = this->m_vecTarget;
+
+						if ( vel.x != 0.0f )
+							vel.x += CGeneral::GetRandomNumberInRange(-this->m_fRandVal, this->m_fRandVal);
+						
+						if ( vel.y != 0.0f )
+							vel.y += CGeneral::GetRandomNumberInRange(-this->m_fRandVal, this->m_fRandVal);
+						
+						if ( vel.z != 0.0f )
+							vel.z += CGeneral::GetRandomNumberInRange(-this->m_fRandVal, this->m_fRandVal);
+						
+						CParticle::AddParticle(this->m_ParticleType, this->GetPosition(), vel, NULL, this->m_fSize,
+							CGeneral::GetRandomNumberInRange(-6.0f, 6.0f));
+					}
+					
+					break;
+				}
+				
+				case POBJECT_PED_WATER_SPLASH:
+				{
+					CRGBA colorsmoke(255, 255, 255, 196);
+					
+					CVector pos = this->GetPosition();
+					CVector vel = this->m_vecTarget;
+					
+					for ( int32 i = 0; i < 3; i++ )
+					{
+						int32 angle = 90 * i;
+						float fCos = CParticle::Cos(angle);
+						float fSin = CParticle::Sin(angle);
+						
+						CVector splashpos;
+						CVector splashvel;
+												
+						splashpos = pos + CVector(0.75f*fCos, 0.75f*fSin, 0.0f);
+						splashvel = vel + CVector(0.05f*fCos, 0.05f*fSin, CGeneral::GetRandomNumberInRange(0.04f, 0.08f));
+						
+						CParticle::AddParticle(PARTICLE_RUBBER_SMOKE, splashpos, splashvel, NULL,
+							CGeneral::GetRandomNumberInRange(0.1f, 0.8f), colorsmoke);
+						CParticle::AddParticle(PARTICLE_CAR_SPLASH, splashpos, splashvel, NULL,
+							CGeneral::GetRandomNumberInRange(0.1f, 0.5f), this->m_Color);
+						
+
+						splashpos = pos + CVector(0.75f*fCos, 0.75f*-fSin, 0.0f);
+						splashvel = vel + CVector(0.05f*fCos, 0.05f*-fSin, CGeneral::GetRandomNumberInRange(0.04f, 0.08f));
+						
+						
+						CParticle::AddParticle(PARTICLE_RUBBER_SMOKE, splashpos, splashvel, NULL,
+							CGeneral::GetRandomNumberInRange(0.1f, 0.8f), colorsmoke);
+						CParticle::AddParticle(PARTICLE_CAR_SPLASH, splashpos, splashvel, NULL,
+							CGeneral::GetRandomNumberInRange(0.1f, 0.5f), this->m_Color);
+						
+						
+						splashpos = pos + CVector(0.75f*-fCos, 0.75f*fSin, 0.0f);
+						splashvel = vel + CVector(0.05f*-fCos, 0.05f*fSin, CGeneral::GetRandomNumberInRange(0.04f, 0.08f));
+						
+						
+						CParticle::AddParticle(PARTICLE_RUBBER_SMOKE, splashpos, splashvel, NULL,
+							CGeneral::GetRandomNumberInRange(0.1f, 0.8f), colorsmoke);
+						CParticle::AddParticle(PARTICLE_CAR_SPLASH, splashpos, splashvel, NULL,
+							CGeneral::GetRandomNumberInRange(0.1f, 0.5f), this->m_Color);
+						
+						
+						splashpos = pos + CVector(0.75f*-fCos, 0.75f*-fSin, 0.0f);
+						splashvel = vel + CVector(0.05f*-fCos, 0.05f*-fSin, CGeneral::GetRandomNumberInRange(0.04f, 0.08f));
+						
+						CParticle::AddParticle(PARTICLE_RUBBER_SMOKE, splashpos, splashvel, NULL,
+							CGeneral::GetRandomNumberInRange(0.1f, 0.8f), colorsmoke);
+						CParticle::AddParticle(PARTICLE_CAR_SPLASH, splashpos, splashvel, NULL,
+							CGeneral::GetRandomNumberInRange(0.1f, 0.5f), this->m_Color);
+					}
+					
+					for ( int32 i = 0; i < 1; i++ )
+					{
+						int32 angle = 180 * (i + 1);
+						
+						float fCos = CParticle::Cos(angle);
+						float fSin = CParticle::Sin(angle);
+						
+						CVector splashpos;
+						CVector splashvel;
+						
+						splashpos = pos + CVector(0.5f*fCos, 0.5f*fSin, 0.0f);
+						splashvel = vel;
+						splashvel.x += CGeneral::GetRandomNumberInRange(-0.25f, 0.25f) * fCos;
+						splashvel.y += CGeneral::GetRandomNumberInRange(-0.25f, 0.25f) * fSin;
+						splashvel.z += CGeneral::GetRandomNumberInRange(0.05f, 0.25f);
+						
+						CParticle::AddParticle(PARTICLE_CAR_SPLASH, splashpos, splashvel, NULL,
+							CGeneral::GetRandomNumberInRange(0.4f, 1.0f), this->m_Color);
+						
+						
+						splashpos = pos + CVector(0.5f*fCos, 0.5f*-fSin, 0.0f);
+						splashvel = vel;
+						splashvel.x += CGeneral::GetRandomNumberInRange(-0.25f, 0.25f) *  fCos;
+						splashvel.y += CGeneral::GetRandomNumberInRange(-0.25f, 0.25f) * -fSin;
+						splashvel.z += CGeneral::GetRandomNumberInRange(0.05f, 0.25f);
+
+						CParticle::AddParticle(PARTICLE_CAR_SPLASH, splashpos, splashvel, NULL,
+							CGeneral::GetRandomNumberInRange(0.4f, 1.0f), this->m_Color);
+						
+						
+						splashpos = pos + CVector(0.5f*-fCos, 0.5f*fSin, 0.0f);
+						splashvel = vel;
+						splashvel.x += CGeneral::GetRandomNumberInRange(-0.25f, 0.25f) * -fCos;
+						splashvel.y += CGeneral::GetRandomNumberInRange(-0.25f, 0.25f) *  fSin;
+						splashvel.z += CGeneral::GetRandomNumberInRange(0.05f, 0.25f);
+
+						CParticle::AddParticle(PARTICLE_CAR_SPLASH, splashpos, splashvel, NULL,
+							CGeneral::GetRandomNumberInRange(0.4f, 1.0f), this->m_Color);
+						
+						
+						splashpos = pos + CVector(0.5f*-fCos, 0.5f*-fSin, 0.0f);
+						splashvel = vel;
+						splashvel.x += CGeneral::GetRandomNumberInRange(-0.25f, 0.25f) * -fCos;
+						splashvel.y += CGeneral::GetRandomNumberInRange(-0.25f, 0.25f) * -fSin;
+						splashvel.z += CGeneral::GetRandomNumberInRange(0.05f, 0.25f);
+
+						CParticle::AddParticle(PARTICLE_CAR_SPLASH, splashpos, splashvel, NULL,
+							CGeneral::GetRandomNumberInRange(0.4f, 1.0f), this->m_Color);
+					}
+					
+					break;
+				}
+				
+				case POBJECT_CAR_WATER_SPLASH:
+				{
+					CRGBA colorsmoke(255, 255, 255, 196);
+					
+					CVector pos = this->GetPosition();
+					CVector vel = this->m_vecTarget;
+					
+					float size = CGeneral::GetRandomNumberInRange(1.0f, 2.5f);
+					
+					for ( int32 i = 0; i < 3; i++ )
+					{
+						int32 angle = 90 * i;
+						
+						float fCos = CParticle::Cos(angle);
+						float fSin = CParticle::Sin(angle);
+						
+						CVector splashpos;
+						CVector splashvel;
+						
+						splashpos = pos + CVector(2.0f*fCos, 2.0f*fSin, 0.0f);
+						splashvel = vel;
+						splashvel.x += CGeneral::GetRandomNumberInRange(-0.5f, 0.5f) * fCos;
+						splashvel.y += CGeneral::GetRandomNumberInRange(-0.5f, 0.5f) * fSin;
+						splashvel.z += CGeneral::GetRandomNumberInRange(0.01f, 0.03f);
+						
+						CParticle::AddParticle(PARTICLE_RUBBER_SMOKE, splashpos, splashvel, NULL, size, colorsmoke);
+						CParticle::AddParticle(PARTICLE_CAR_SPLASH, splashpos, splashvel, NULL, 0.0f, this->m_Color);
+						
+
+						splashpos = pos + CVector(2.0f*fCos, 2.0f*-fSin, 0.0f);						
+						splashvel = vel;
+						splashvel.x += CGeneral::GetRandomNumberInRange(-0.5f, 0.5f) * fCos;
+						splashvel.y += CGeneral::GetRandomNumberInRange(-0.5f, 0.5f) * -fSin;
+						splashvel.z += CGeneral::GetRandomNumberInRange(0.01f, 0.03f);
+						
+						CParticle::AddParticle(PARTICLE_RUBBER_SMOKE, splashpos, splashvel, NULL, size, colorsmoke);
+						CParticle::AddParticle(PARTICLE_CAR_SPLASH, splashpos, splashvel, NULL, 0.0f, this->m_Color);
+						
+						splashpos = pos + CVector(2.0f*-fCos, 2.0f*fSin, 0.0f);
+						splashvel = vel;
+						splashvel.x += CGeneral::GetRandomNumberInRange(-0.5f, 0.5f) * -fCos;
+						splashvel.y += CGeneral::GetRandomNumberInRange(-0.5f, 0.5f) * fSin;
+						splashvel.z += CGeneral::GetRandomNumberInRange(0.01f, 0.03f);
+						
+						CParticle::AddParticle(PARTICLE_RUBBER_SMOKE, splashpos, splashvel, NULL, size, colorsmoke);
+						CParticle::AddParticle(PARTICLE_CAR_SPLASH, splashpos, splashvel, NULL, 0.0f, this->m_Color);
+						
+						splashpos = pos + CVector(2.0f*-fCos, 2.0f*-fSin, 0.0f);
+						splashvel = vel;
+						splashvel.x += CGeneral::GetRandomNumberInRange(-0.5f, 0.5f) * -fCos;
+						splashvel.y += CGeneral::GetRandomNumberInRange(-0.5f, 0.5f) * -fSin;
+						splashvel.z += CGeneral::GetRandomNumberInRange(0.01f, 0.03f);
+						
+						CParticle::AddParticle(PARTICLE_RUBBER_SMOKE, splashpos, splashvel, NULL, size, colorsmoke);
+						CParticle::AddParticle(PARTICLE_CAR_SPLASH, splashpos, splashvel, NULL, 0.0f, this->m_Color);
+					}
+					
+					for ( int32 i = 0; i < 1; i++ )
+					{
+						int32 angle = 180 * (i + 1);
+						
+						float fCos = CParticle::Cos(angle);
+						float fSin = CParticle::Sin(angle);
+						
+						CVector splashpos;
+						CVector splashvel;
+						
+						
+						splashpos = pos + CVector(1.25f*fCos, 1.25f*fSin, 0.0f);
+						splashvel = vel;
+						splashvel.x += CGeneral::GetRandomNumberInRange(-0.1f, 0.1f) * fCos;
+						splashvel.y += CGeneral::GetRandomNumberInRange(-0.1f, 0.1f) * fSin;
+						splashvel.z += CGeneral::GetRandomNumberInRange(0.26f, 0.53f);
+						CParticle::AddParticle(PARTICLE_CAR_SPLASH, splashpos, splashvel, NULL, 0.0f, this->m_Color);
+						
+						splashpos = pos + CVector(1.25f*fCos, 1.25f*-fSin, 0.0f);						
+						splashvel = vel;
+						splashvel.x += CGeneral::GetRandomNumberInRange(-0.1f, 0.1f) * fCos;
+						splashvel.y += CGeneral::GetRandomNumberInRange(-0.1f, 0.1f) * -fSin;
+						splashvel.z += CGeneral::GetRandomNumberInRange(0.26f, 0.53f);
+						CParticle::AddParticle(PARTICLE_CAR_SPLASH, splashpos, splashvel, NULL, 0.0f, this->m_Color);
+						
+						splashpos = pos + CVector(1.25f*-fCos, 1.25f*fSin, 0.0f);						
+						splashvel = vel;
+						splashvel.x += CGeneral::GetRandomNumberInRange(-0.1f, 0.1f) * -fCos;
+						splashvel.y += CGeneral::GetRandomNumberInRange(-0.1f, 0.1f) * fSin;
+						splashvel.z += CGeneral::GetRandomNumberInRange(0.26f, 0.53f);
+						CParticle::AddParticle(PARTICLE_CAR_SPLASH, splashpos, splashvel, NULL, 0.0f, this->m_Color);
+
+						splashpos = pos + CVector(1.25f*-fCos, 1.25f*-fSin, 0.0f);						
+						splashvel = vel;
+						splashvel.x += CGeneral::GetRandomNumberInRange(-0.1f, 0.1f) * -fCos;
+						splashvel.y += CGeneral::GetRandomNumberInRange(-0.1f, 0.1f) * -fSin;
+						splashvel.z += CGeneral::GetRandomNumberInRange(0.26f, 0.53f);
+						CParticle::AddParticle(PARTICLE_CAR_SPLASH, splashpos, splashvel, NULL, 0.0f, this->m_Color);
+					}
+					
+					break;
+				}
+				
+				case POBJECT_SPLASHES_AROUND:
+				{
+					CVector pos = this->GetPosition();
+					float size  = this->m_fSize;
+					
+					for ( int32 i = 0; i < this->m_nNumEffectCycles; i++ )
+					{
+						CVector splashpos = pos;
+						
+						splashpos.x += CGeneral::GetRandomNumberInRange(-size, size);
+						splashpos.y += CGeneral::GetRandomNumberInRange(-size, size);
+
+						if ( CGeneral::GetRandomNumber() & 1 )
+						{
+							CParticle::AddParticle(PARTICLE_RAIN_SPLASH,   splashpos, CVector(0.0f, 0.0f, 0.0f),
+								NULL, 0.1f,  this->m_Color);
+						}
+						else
+						{
+							CParticle::AddParticle(PARTICLE_RAIN_SPLASHUP, splashpos, CVector(0.0f, 0.0f, 0.0f),
+								NULL, 0.12f, this->m_Color);
+						}
+					}
+			
+					break;
+				}
+				
+				case POBJECT_CATALINAS_GUNFLASH:
+				{
+					CRGBA flashcolor(120, 120, 120, 255);
+					
+					CVector vel = this->m_vecTarget;
+					CVector pos = this->GetPosition();
+
+					float size = 1.0f;
+					if ( this->m_fSize != 0.0f )
+						size = this->m_fSize;
+					
+					CParticle::AddParticle(PARTICLE_GUNFLASH, pos, CVector(0.0f, 0.0f, 0.0f), NULL, 0.12f*size, flashcolor);
+					
+					pos += size * (0.06f * vel);
+					CParticle::AddParticle(PARTICLE_GUNFLASH, pos, CVector(0.0f, 0.0f, 0.0f), NULL, 0.08f*size, flashcolor);
+					
+					pos += size * (0.04f * vel);
+					CParticle::AddParticle(PARTICLE_GUNFLASH, pos, CVector(0.0f, 0.0f, 0.0f), NULL, 0.04f*size, flashcolor);
+					
+					CVector smokepos = this->GetPosition();
+					CVector smokevel = 0.1f * vel;
+					CParticle::AddParticle(PARTICLE_GUNSMOKE2, smokepos, smokevel, NULL, 0.005f*size);
+					
+					break;
+				}
+				
+				case POBJECT_CATALINAS_SHOTGUNFLASH:
+				{
+					CRGBA flashcolor(120, 120, 120, 255);
+					
+					CVector vel = this->m_vecTarget;
+					
+					float size = 1.0f;
+					if ( this->m_fSize != 0.0f )
+						size = this->m_fSize;
+					
+					CVector pos = this->GetPosition();
+															
+					CVector velstep  = size * (0.1f * vel);
+					CVector flashpos = pos;
+					
+					flashpos += velstep;
+					CParticle::AddParticle(PARTICLE_GUNFLASH, flashpos, CVector(0.0f, 0.0f, 0.0f), NULL, 0.0f, flashcolor);
+					
+					flashpos += velstep;
+					CParticle::AddParticle(PARTICLE_GUNFLASH, flashpos, CVector(0.0f, 0.0f, 0.0f), NULL, 0.15f*size, flashcolor);
+					
+					flashpos += velstep;
+					CParticle::AddParticle(PARTICLE_GUNFLASH, flashpos, CVector(0.0f, 0.0f, 0.0f), NULL, 0.2f*size, flashcolor);
+					
+					
+					CParticle::AddParticle(PARTICLE_GUNFLASH, pos, CVector(0.0f, 0.0f, 0.0f), NULL, 0.0f, flashcolor);
+					
+					CVector smokepos = this->GetPosition();
+					CVector smokevel = 0.1f*vel;
+					CParticle::AddParticle(PARTICLE_GUNSMOKE2, smokepos, smokevel, NULL, 0.1f*size);
+			
+					break;
+				}
+				
+				default:
+				{
+					if ( this->m_fRandVal != 0.0f )
+					{
+						for ( int32 i = 0; i < this->m_nNumEffectCycles; i++ )
+						{
+							CVector vel = this->m_vecTarget;
+							
+							if ( vel.x != 0.0f )
+								vel.x += CGeneral::GetRandomNumberInRange(-this->m_fRandVal, this->m_fRandVal);
+							
+							if ( vel.y != 0.0f )
+								vel.y += CGeneral::GetRandomNumberInRange(-this->m_fRandVal, this->m_fRandVal);
+							
+							if ( vel.z != 0.0f )
+								vel.z += CGeneral::GetRandomNumberInRange(-this->m_fRandVal, this->m_fRandVal);
+							
+							CParticle::AddParticle(this->m_ParticleType, this->GetPosition(), vel, NULL,
+								this->m_fSize, this->m_Color);
+						}
+					}
+					else
+					{
+						for ( int32 i = 0; i < this->m_nNumEffectCycles; i++ )
+						{
+							CParticle::AddParticle(this->m_ParticleType, this->GetPosition(), this->m_vecTarget, NULL,
+								this->m_fSize, this->m_Color);
+						}
+					}
+					
+					break;
+				}
+			}
+		}
+	}
+	
+	if ( this->m_nRemoveTimer != 0 && this->m_nRemoveTimer < CTimer::GetTimeInMilliseconds() )
+	{
+		MoveToList(&pCloseListHead, &pUnusedListHead, this);
+		this->m_nState = POBJECTSTATE_FREE;
+
+		if ( this->m_Type == POBJECT_FIRE_HYDRANT )
+			CAudioHydrant::Remove(this);
+	}
+}
+
+void
+CParticleObject::UpdateFar(void)
+{
+	if ( this->m_nRemoveTimer != 0 && this->m_nRemoveTimer < CTimer::GetTimeInMilliseconds() )
+	{
+		MoveToList(&pFarListHead, &pUnusedListHead, this);
+		this->m_nState = POBJECTSTATE_FREE;
+		
+		if ( this->m_Type == POBJECT_FIRE_HYDRANT )
+			CAudioHydrant::Remove(this);
+	}
+	
+	CVector2D dist = this->GetPosition() - TheCamera.GetPosition();
+	if ( dist.MagnitudeSqr() < SQR(100.0f)/*10000.0f*/ )
+	{
+		MoveToList(&pFarListHead, &pCloseListHead, this);
+		this->m_nState = POBJECTSTATE_UPDATE_CLOSE;
+	}
+}
+
+bool
+CParticleObject::SaveParticle(uint8 *buffer, uint32 *length)
+{
+	ASSERT( buffer != NULL );
+	ASSERT( length != NULL );
+	
+	int32 numObjects = 0;
+	
+	for ( CParticleObject *p = pCloseListHead; p != NULL; p = p->m_pNext )
+		++numObjects;
+	
+	for ( CParticleObject *p = pFarListHead; p != NULL; p = p->m_pNext )
+		++numObjects;
+	
+	*(int32 *)buffer = numObjects;
+	buffer += sizeof(int32);
+	
+	int32 objectsLength = sizeof(CParticleObject) * (numObjects + 1);
+	int32 dataLength = objectsLength + sizeof(int32);
+	
+	for ( CParticleObject *p = pCloseListHead; p != NULL; p = p->m_pNext )
+	{
+		memcpy(buffer, p, sizeof(CParticleObject));
+		buffer += sizeof(CParticleObject);
+	}
+	
+	for ( CParticleObject *p = pFarListHead; p != NULL; p = p->m_pNext )
+	{
+		memcpy(buffer, p, sizeof(CParticleObject));
+		buffer += sizeof(CParticleObject);
+	}
+	
+	*length = dataLength;
+  
+	return true;
+}
+
+bool
+CParticleObject::LoadParticle(uint8 *buffer, uint32  length)
+{
+	ASSERT( buffer != NULL );
+	
+	RemoveAllParticleObjects();
+	
+	int32 numObjects = *(int32 *)buffer;
+	buffer += sizeof(int32);
+	
+	if ( length != sizeof(CParticleObject) * (numObjects + 1) + sizeof(int32) )
+		return false;
+	
+	if ( numObjects == 0 )
+		return true;
+	
+
+	int32 i = 0;
+	while ( i < numObjects )
+	{
+		CParticleObject *dst = pUnusedListHead;
+		CParticleObject *src = (CParticleObject *)buffer;
+		buffer += sizeof(CParticleObject);
+		
+		if ( dst == NULL )
+			return false;
+		
+		MoveToList(&pUnusedListHead, &pCloseListHead, dst);
+		
+		dst->m_nState           = POBJECTSTATE_UPDATE_CLOSE;
+		dst->m_Type             = src->m_Type;
+		dst->m_ParticleType     = src->m_ParticleType;
+		dst->GetPosition()      = src->GetPosition();
+		dst->m_vecTarget        = src->m_vecTarget;
+		dst->m_nFrameCounter    = src->m_nFrameCounter;
+		dst->m_bRemove          = src->m_bRemove;
+		dst->m_pParticle        = NULL;
+		dst->m_nRemoveTimer     = src->m_nRemoveTimer;
+		dst->m_Color            = src->m_Color;
+		dst->m_fSize            = src->m_fSize;
+		dst->m_fRandVal         = src->m_fRandVal;
+		dst->m_nNumEffectCycles = src->m_nNumEffectCycles;
+		dst->m_nSkipFrames      = src->m_nSkipFrames;
+		dst->m_nCreationChance  = src->m_nCreationChance;
+		
+		i++;
+	}
+	
+	return true;
+}
+
+void
+CParticleObject::RemoveAllParticleObjects(void)
+{
+	pUnusedListHead = &gPObjectArray[0];
+	
+	pCloseListHead = NULL;
+	pFarListHead   = NULL;
+	
+	for ( int32 i = 0; i < MAX_PARTICLEOBJECTS; i++ )
+	{
+		if ( i == 0 )
+			gPObjectArray[i].m_pPrev = NULL;
+		else
+			gPObjectArray[i].m_pPrev = &gPObjectArray[i - 1];
+		
+		if ( i == MAX_PARTICLEOBJECTS-1 )
+			gPObjectArray[i].m_pNext = NULL;
+		else
+			gPObjectArray[i].m_pNext = &gPObjectArray[i + 1];
+		
+		gPObjectArray[i].m_nState = POBJECTSTATE_FREE;
+	}
+}
+
+void
+CParticleObject::MoveToList(CParticleObject **from, CParticleObject **to, CParticleObject *obj)
+{
+	ASSERT( from != NULL );
+	ASSERT( to   != NULL );
+	ASSERT( obj  != NULL );
+	
+	if ( obj->m_pPrev == NULL )
+	{
+		*from = obj->m_pNext;
+		if ( *from )
+			(*from)->m_pPrev = NULL;
+	}
+	else
+	{
+		if ( obj->m_pNext == NULL )
+			obj->m_pPrev->m_pNext = NULL;
+		else
+		{
+			obj->m_pNext->m_pPrev = obj->m_pPrev;
+			obj->m_pPrev->m_pNext = obj->m_pNext;
+		}
+	}
+	
+	obj->m_pNext = *to;
+	obj->m_pPrev = NULL;
+	*to = obj;
+
+	if ( obj->m_pNext )
+		obj->m_pNext->m_pPrev = obj;
 }
 
 class CParticleObject_ : public CParticleObject
 {
 public:
+	void ctor() { CParticleObject::CParticleObject(); }
 	void dtor() { CParticleObject::~CParticleObject(); }
 };
 
 STARTPATCHES
+	InjectHook(0x4BC330, CAudioHydrant::Add, PATCH_JUMP);
+	InjectHook(0x4BC390, CAudioHydrant::Remove, PATCH_JUMP);
+	
+	InjectHook(0x4BC3E0, &CParticleObject_::ctor, PATCH_JUMP);
 	InjectHook(0x4BC420, &CParticleObject_::dtor, PATCH_JUMP);
+	InjectHook(0x4BC440, CParticleObject::Initialise, PATCH_JUMP);
+	
+	InjectHook(0x4BC4D0, (CParticleObject *(*)(uint16, CVector const &, uint8))CParticleObject::AddObject, PATCH_JUMP);
+	InjectHook(0x4BC520, (CParticleObject *(*)(uint16, CVector const &, float, uint8))CParticleObject::AddObject, PATCH_JUMP);
+	InjectHook(0x4BC570, (CParticleObject *(*)(uint16, CVector const &, CVector const &, float, uint8))CParticleObject::AddObject, PATCH_JUMP);
+	InjectHook(0x4BC5B0, (CParticleObject *(*)(uint16, CVector const &, CVector const &, float, uint32, RwRGBA const &, uint8))CParticleObject::AddObject, PATCH_JUMP);
+
+	InjectHook(0x4BC9F0, &CParticleObject::RemoveObject, PATCH_JUMP);
+	InjectHook(0x4BCA30, CParticleObject::UpdateAll, PATCH_JUMP);
+	InjectHook(0x4BCA80, &CParticleObject::UpdateClose, PATCH_JUMP);
+	InjectHook(0x4BF9F0, &CParticleObject::UpdateFar, PATCH_JUMP);
+	InjectHook(0x4BFA80, CParticleObject::SaveParticle, PATCH_JUMP);
+	InjectHook(0x4BFB30, CParticleObject::LoadParticle, PATCH_JUMP);
+	InjectHook(0x4BFC80, CParticleObject::RemoveAllParticleObjects, PATCH_JUMP);
+	InjectHook(0x4BFD10, CParticleObject::MoveToList, PATCH_JUMP);
+	//InjectHook(0x4BFD70, CParticleObject::~CParticleObject, PATCH_JUMP); // virtual
+	//InjectHook(0x4BFDB0, `global constructor keyed to'ParticleObject.cpp, PATCH_JUMP);
+	//InjectHook(0x4BFE00, CAudioHydrant::CAudioHydrant, PATCH_JUMP);
+	//InjectHook(0x4BFE10, sub_4BFE10, PATCH_JUMP); // destroy gPObjectArray array
+	
+	
 ENDPATCHES