9 files changed, 1121 insertions, 484 deletions

diff --git a/src/render/MBlur.h b/src/render/MBlur.h
index 3129c070..5eac8dc0 100644
--- a/src/render/MBlur.h
+++ b/src/render/MBlur.h
@@ -1,5 +1,15 @@
 #pragma once
 
+enum FxType
+{
+	FXTYPE_0 = 0,
+	FXTYPE_1,
+	FXTYPE_2,
+	FXTYPE_3,
+	FXTYPE_4,
+	FXTYPE_5,
+};
+
 class CMBlur
 {
 public:
@@ -15,4 +25,8 @@ public:
 	static void MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blur, int32 type);
 	static void OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type);
 	static void ClearDrunkBlur();
+	
+	//TODO
+	static void AddRenderFx(RwCamera *,RwRect *,float,FxType)
+	{}
 };
diff --git a/src/render/Particle.cpp b/src/render/Particle.cpp
index 5f37bdc6..d5b05947 100644
--- a/src/render/Particle.cpp
+++ b/src/render/Particle.cpp
@@ -8,20 +8,23 @@
 #include "Collision.h"
 #include "World.h"
 #include "Shadows.h"
+#include "Replay.h"
+#include "Stats.h"
+#include "Weather.h"
+#include "MBlur.h"
+#include "main.h"
 #include "AudioScriptObject.h"
 #include "ParticleObject.h"
 #include "Particle.h"
 #include "soundlist.h"
 
 
-#define MAX_PARTICLES_ON_SCREEN   (1000)
+#define MAX_PARTICLES_ON_SCREEN   (750)
 
 
 //(5)
 #define MAX_SMOKE_FILES           ARRAY_SIZE(SmokeFiles)
 
-//(5)
-#define MAX_SMOKE2_FILES          ARRAY_SIZE(Smoke2Files)
 //(5) 
 #define MAX_RUBBER_FILES          ARRAY_SIZE(RubberFiles)
 //(5)
@@ -36,16 +39,16 @@
 #define MAX_RAINSPLASHUP_FILES    ARRAY_SIZE(RainSplashupFiles)
 //(4)
 #define MAX_BIRDFRONT_FILES       ARRAY_SIZE(BirdfrontFiles)
+//(8)
+#define MAX_BOAT_FILES            ARRAY_SIZE(BoatFiles)
 //(4)
 #define MAX_CARDEBRIS_FILES       ARRAY_SIZE(CardebrisFiles)
 //(4)
 #define MAX_CARSPLASH_FILES       ARRAY_SIZE(CarsplashFiles)
 
-//(4)
-#define MAX_RAINDROP_FILES        ARRAY_SIZE(RaindropFiles)
-
-
+#define MAX_RAINDRIP_FILES       (2)
 
+	
 const char SmokeFiles[][6+1] =
 {
 	"smoke1",
@@ -56,15 +59,6 @@ const char SmokeFiles[][6+1] =
 };
 
 
-const char Smoke2Files[][9+1] =
-{
-	"smokeII_1",
-	"smokeII_2",
-	"smokeII_3",
-	"smokeII_4",
-	"smokeII_5"
-};
-
 const char RubberFiles[][7+1] =
 {
 	"rubber1",
@@ -108,14 +102,6 @@ const char GunFlashFiles[][9+1] =
 	"gunflash4"
 };
 
-const char RaindropFiles[][9+1] =
-{
-	"raindrop1",
-	"raindrop2",
-	"raindrop3",
-	"raindrop4"
-};
-
 const char RainSplashupFiles[][10+1] =
 {
 	"splash_up1",
@@ -130,6 +116,18 @@ const char BirdfrontFiles[][8+1] =
 	"birdf_04"
 };
 
+const char BoatFiles[][8+1] =
+{
+	"boats_01",
+	"boats_02",
+	"boats_03",
+	"boats_04",
+	"boats_05",
+	"boats_06",
+	"boats_07",
+	"boats_08"
+};
+
 const char CardebrisFiles[][12+1] =
 {
 	"cardebris_01",
@@ -149,7 +147,7 @@ const char CarsplashFiles[][12+1] =
 CParticle gParticleArray[MAX_PARTICLES_ON_SCREEN];
 
 RwTexture *gpSmokeTex[MAX_SMOKE_FILES];
-RwTexture *gpSmoke2Tex[MAX_SMOKE2_FILES];
+RwTexture *gpSmoke2Tex;
 RwTexture *gpRubberTex[MAX_RUBBER_FILES];
 RwTexture *gpRainSplashTex[MAX_RAINSPLASH_FILES];
 RwTexture *gpWatersprayTex[MAX_WATERSPRAY_FILES];
@@ -157,26 +155,27 @@ RwTexture *gpExplosionMediumTex[MAX_EXPLOSIONMEDIUM_FILES];
 RwTexture *gpGunFlashTex[MAX_GUNFLASH_FILES];
 RwTexture *gpRainSplashupTex[MAX_RAINSPLASHUP_FILES];
 RwTexture *gpBirdfrontTex[MAX_BIRDFRONT_FILES];
+RwTexture *gpBoatTex[MAX_BOAT_FILES];
 RwTexture *gpCarDebrisTex[MAX_CARDEBRIS_FILES];
 RwTexture *gpCarSplashTex[MAX_CARSPLASH_FILES];
 
+RwTexture *gpBoatWakeTex;
 RwTexture *gpFlame1Tex;
 RwTexture *gpFlame5Tex;
 RwTexture *gpRainDropSmallTex;
 RwTexture *gpBloodTex;
 RwTexture *gpLeafTex;
-RwTexture *gpCloudTex1; // unused
+RwTexture *gpCloudTex1;
 RwTexture *gpCloudTex4;
 RwTexture *gpBloodSmallTex;
 RwTexture *gpGungeTex;
 RwTexture *gpCollisionSmokeTex;
 RwTexture *gpBulletHitTex;
 RwTexture *gpGunShellTex;
-RwTexture *gpWakeOldTex;
 RwTexture *gpPointlightTex;
 
 RwRaster  *gpSmokeRaster[MAX_SMOKE_FILES];
-RwRaster  *gpSmoke2Raster[MAX_SMOKE2_FILES];
+RwRaster  *gpSmoke2Raster;
 RwRaster  *gpRubberRaster[MAX_RUBBER_FILES];
 RwRaster  *gpRainSplashRaster[MAX_RAINSPLASH_FILES];
 RwRaster  *gpWatersprayRaster[MAX_WATERSPRAY_FILES];
@@ -184,45 +183,62 @@ RwRaster  *gpExplosionMediumRaster[MAX_EXPLOSIONMEDIUM_FILES];
 RwRaster  *gpGunFlashRaster[MAX_GUNFLASH_FILES];
 RwRaster  *gpRainSplashupRaster[MAX_RAINSPLASHUP_FILES];
 RwRaster  *gpBirdfrontRaster[MAX_BIRDFRONT_FILES];
+RwRaster  *gpBoatRaster[MAX_BOAT_FILES];
 RwRaster  *gpCarDebrisRaster[MAX_CARDEBRIS_FILES];
 RwRaster  *gpCarSplashRaster[MAX_CARSPLASH_FILES];
 
+RwRaster  *gpBoatWakeRaster;
 RwRaster  *gpFlame1Raster;
 RwRaster  *gpFlame5Raster;
 RwRaster  *gpRainDropSmallRaster;
 RwRaster  *gpBloodRaster;
 RwRaster  *gpLeafRaster;
-RwRaster  *gpCloudRaster1; // unused
+RwRaster  *gpCloudRaster1;
 RwRaster  *gpCloudRaster4;
 RwRaster  *gpBloodSmallRaster;
 RwRaster  *gpGungeRaster;
 RwRaster  *gpCollisionSmokeRaster;
 RwRaster  *gpBulletHitRaster;
 RwRaster  *gpGunShellRaster;
-RwRaster  *gpWakeOldRaster;
-
-
-RwRaster  *gpPointlightRaster;	// CPointLights::RenderFogEffect
-
-RwTexture *gpRainDropTex[MAX_RAINDROP_FILES]; // CWeather::RenderRainStreaks
-
-
-RwRaster  *gpRainDropRaster[MAX_RAINDROP_FILES];
+RwRaster  *gpPointlightRaster;
+
+RwTexture *gpRainDropTex;
+RwRaster  *gpRainDropRaster;
+
+RwTexture *gpLetterTex;
+RwRaster *gpLetterRaster;
+
+RwTexture *gpSparkTex;
+RwTexture *gpNewspaperTex;
+RwTexture *gpGunSmokeTex;
+RwTexture *gpDotTex;
+RwTexture *gpHeathazeTex;
+RwTexture *gpBeastieTex;
+RwTexture *gpRaindripTex1[MAX_RAINDRIP_FILES];
+RwTexture *gpRaindripTex2[MAX_RAINDRIP_FILES];
+
+RwRaster *gpSparkRaster;
+RwRaster *gpNewspaperRaster;
+RwRaster *gpGunSmokeRaster;
+RwRaster *gpDotRaster;
+RwRaster *gpHeathazeRaster;
+RwRaster *gpBeastieRaster;
+RwRaster *gpRaindripRaster1[MAX_RAINDRIP_FILES];
+RwRaster *gpRaindripRaster2[MAX_RAINDRIP_FILES];
 
 float      CParticle::ms_afRandTable[CParticle::RAND_TABLE_SIZE];
-
-
 CParticle *CParticle::m_pUnusedListHead;
-
-
 float      CParticle::m_SinTable[CParticle::SIN_COS_TABLE_SIZE];
 float      CParticle::m_CosTable[CParticle::SIN_COS_TABLE_SIZE]; 
 
 int32 Randomizer;
-
 int32 nParticleCreationInterval = 1;
+float PARTICLE_WIND_TEST_SCALE  = 0.002f;
 float fParticleScaleLimit       = 0.5f;
 
+bool clearWaterDrop;
+int32 numWaterDropOnScreen;
+
 #ifdef DEBUGMENU
 SETTWEAKPATH("Particle");
 TWEAKINT32(nParticleCreationInterval, 0, 5, 1);
@@ -230,6 +246,8 @@ TWEAKFLOAT(fParticleScaleLimit, 0.0f, 1.0f, 0.1f);
 TWEAKFUNC(CParticle::ReloadConfig);
 #endif
 
+
+
 void CParticle::ReloadConfig()
 {
 	debug("Initialising CParticleMgr...");
@@ -302,8 +320,8 @@ void CParticle::Initialise()
 	{		
 		float angle = DEGTORAD(float(i) * float(360.0f / SIN_COS_TABLE_SIZE));
 
-		m_SinTable[i] = Sin(angle);
-		m_CosTable[i] = Cos(angle);
+		m_SinTable[i] = ::Sin(angle);
+		m_CosTable[i] = ::Cos(angle);
 	}
 	
 	int32 slot = CTxdStore::FindTxdSlot("particle");
@@ -317,11 +335,8 @@ void CParticle::Initialise()
 		gpSmokeRaster[i] = RwTextureGetRaster(gpSmokeTex[i]);
 	}
 	
-	for ( int32 i = 0; i < MAX_SMOKE2_FILES; i++ )
-	{
-		gpSmoke2Tex[i] = RwTextureRead(Smoke2Files[i], nil);
-		gpSmoke2Raster[i] = RwTextureGetRaster(gpSmoke2Tex[i]);
-	}
+	gpSmoke2Tex = RwTextureRead("smokeII_3", nil);
+	gpSmoke2Raster = RwTextureGetRaster(gpSmoke2Tex);
 	
 	for ( int32 i = 0; i < MAX_RUBBER_FILES; i++ )
 	{
@@ -349,15 +364,13 @@ void CParticle::Initialise()
 	
 	for ( int32 i = 0; i < MAX_GUNFLASH_FILES; i++ )
 	{
-		gpGunFlashTex[i] = RwTextureRead(GunFlashFiles[i], NULL);
+		gpGunFlashTex[i] = RwTextureRead(GunFlashFiles[i], nil);
 		gpGunFlashRaster[i] = RwTextureGetRaster(gpGunFlashTex[i]);
 	}
 	
-	for ( int32 i = 0; i < MAX_RAINDROP_FILES; i++ )
-	{
-		gpRainDropTex[i] = RwTextureRead(RaindropFiles[i], nil);
-		gpRainDropRaster[i] = RwTextureGetRaster(gpRainDropTex[i]);
-	}
+	gpRainDropTex = RwTextureRead("raindrop4", nil);
+	gpRainDropRaster = RwTextureGetRaster(gpRainDropTex);
+
 	
 	for ( int32 i = 0; i < MAX_RAINSPLASHUP_FILES; i++ )
 	{
@@ -367,10 +380,16 @@ void CParticle::Initialise()
 	
 	for ( int32 i = 0; i < MAX_BIRDFRONT_FILES; i++ )
 	{
-		gpBirdfrontTex[i] = RwTextureRead(BirdfrontFiles[i], NULL);
+		gpBirdfrontTex[i] = RwTextureRead(BirdfrontFiles[i], nil);
 		gpBirdfrontRaster[i] = RwTextureGetRaster(gpBirdfrontTex[i]);
 	}
 	
+	for ( int32 i = 0; i < MAX_BOAT_FILES; i++ )
+	{
+		gpBoatTex[i] = RwTextureRead(BoatFiles[i], nil);
+		gpBoatRaster[i] = RwTextureGetRaster(gpBoatTex[i]);
+	}
+	
 	for ( int32 i = 0; i < MAX_CARDEBRIS_FILES; i++ )
 	{
 		gpCarDebrisTex[i] = RwTextureRead(CardebrisFiles[i], nil);
@@ -383,7 +402,10 @@ void CParticle::Initialise()
 		gpCarSplashRaster[i] = RwTextureGetRaster(gpCarSplashTex[i]);
 	}
 
-	gpFlame1Tex = RwTextureRead("flame1", NULL);
+	gpBoatWakeTex = RwTextureRead("boatwake2", nil);
+	gpBoatWakeRaster = RwTextureGetRaster(gpBoatWakeTex);
+	
+	gpFlame1Tex = RwTextureRead("flame1", nil);
 	gpFlame1Raster = RwTextureGetRaster(gpFlame1Tex);
 
 	gpFlame5Tex = RwTextureRead("flame5", nil);
@@ -402,6 +424,9 @@ void CParticle::Initialise()
 
 	gpLeafTex = RwTextureRead("gameleaf01_64", nil);
 	gpLeafRaster = RwTextureGetRaster(gpLeafTex);
+	
+	gpLetterTex = RwTextureRead("letter", nil);
+	gpLetterRaster = RwTextureGetRaster(gpLetterTex);
 
 	gpCloudTex1 = RwTextureRead("cloud3", nil);
 	gpCloudRaster1 = RwTextureGetRaster(gpCloudTex1);
@@ -424,12 +449,39 @@ void CParticle::Initialise()
 	gpGunShellTex = RwTextureRead("gunshell", nil);
 	gpGunShellRaster = RwTextureGetRaster(gpGunShellTex);
 
-	gpWakeOldTex = RwTextureRead("wake_old", nil);
-	gpWakeOldRaster = RwTextureGetRaster(gpWakeOldTex);
-
 	gpPointlightTex = RwTextureRead("pointlight", nil);
 	gpPointlightRaster = RwTextureGetRaster(gpPointlightTex);
 	
+	gpSparkTex = RwTextureRead("spark", nil);
+	gpSparkRaster = RwTextureGetRaster(gpSparkTex);
+	
+	gpNewspaperTex = RwTextureRead("newspaper02_64", nil);
+	gpNewspaperRaster = RwTextureGetRaster(gpNewspaperTex);
+	
+	gpGunSmokeTex = RwTextureRead("gunsmoke3", nil);
+	gpGunSmokeRaster = RwTextureGetRaster(gpGunSmokeTex);
+	
+	gpDotTex = RwTextureRead("dot", nil);
+	gpDotRaster = RwTextureGetRaster(gpDotTex);
+	
+	gpHeathazeTex = RwTextureRead("heathaze", nil);
+	gpHeathazeRaster = RwTextureGetRaster(gpHeathazeTex);
+	
+	gpBeastieTex = RwTextureRead("beastie", nil);
+	gpBeastieRaster = RwTextureGetRaster(gpBeastieTex);
+	
+	gpRaindripTex1[0] = RwTextureRead("raindrip64", nil);
+	gpRaindripRaster1[0] = RwTextureGetRaster(gpRaindripTex1[0]);
+	
+	gpRaindripTex1[1] = RwTextureRead("raindripb64", nil);
+	gpRaindripRaster1[1] = RwTextureGetRaster(gpRaindripTex1[1]);
+	
+	gpRaindripTex2[0] = RwTextureRead("raindrip64_d", nil);
+	gpRaindripRaster2[0] = RwTextureGetRaster(gpRaindripTex2[0]);
+	
+	gpRaindripTex2[1] = RwTextureRead("raindripb64_d", nil);
+	gpRaindripRaster2[1] = RwTextureGetRaster(gpRaindripTex2[1]);
+	
 	CTxdStore::PopCurrentTxd();
 	
 	for ( int32 i = 0; i < MAX_PARTICLES; i++ )
@@ -438,145 +490,180 @@ void CParticle::Initialise()
 		
 		switch ( i )
 		{
+			case PARTICLE_SPARK:
+			case PARTICLE_SPARK_SMALL:
+			case PARTICLE_RAINDROP_SMALL:
+			case PARTICLE_HELI_ATTACK:
+				entry->m_ppRaster = &gpRainDropSmallRaster;
+				break;
+			
+			case PARTICLE_WATER_SPARK:
+				entry->m_ppRaster = &gpSparkRaster;
+				break;
+			
+			case PARTICLE_WHEEL_DIRT:
+			case PARTICLE_SAND:
+			case PARTICLE_STEAM2:
+			case PARTICLE_STEAM_NY:
+			case PARTICLE_STEAM_NY_SLOWMOTION:
+			case PARTICLE_GROUND_STEAM:
+			case PARTICLE_ENGINE_STEAM:
+			case PARTICLE_PEDFOOT_DUST:
+			case PARTICLE_CAR_DUST:
+			case PARTICLE_EXHAUST_FUMES:
+				entry->m_ppRaster = &gpSmoke2Raster;
+				break;
+			
+			case PARTICLE_WHEEL_WATER:
+			case PARTICLE_WATER:
+			case PARTICLE_SMOKE:
+			case PARTICLE_SMOKE_SLOWMOTION:
+			case PARTICLE_DRY_ICE:
+			case PARTICLE_GARAGEPAINT_SPRAY:
+			case PARTICLE_STEAM:
+			case PARTICLE_WATER_CANNON:
+			case PARTICLE_EXTINGUISH_STEAM:
+			case PARTICLE_HELI_DUST:
+			case PARTICLE_PAINT_SMOKE:
+			case PARTICLE_BULLETHIT_SMOKE:
+				entry->m_ppRaster = gpSmokeRaster;
+				break;
+			
 			case PARTICLE_BLOOD:
 				entry->m_ppRaster = &gpBloodRaster;
 				break;
-
+			
 			case PARTICLE_BLOOD_SMALL:
 			case PARTICLE_BLOOD_SPURT:
 				entry->m_ppRaster = &gpBloodSmallRaster;
 				break;
-
+			
+			case PARTICLE_DEBRIS:
+			case PARTICLE_TREE_LEAVES:
+				entry->m_ppRaster = &gpLeafRaster;
+				break;
+			
 			case PARTICLE_DEBRIS2:
 				entry->m_ppRaster = &gpGungeRaster;
 				break;
-
+			
+			case PARTICLE_FLYERS:
+				entry->m_ppRaster = &gpNewspaperRaster;
+				break;
+			
+			case PARTICLE_FLAME:
+			case PARTICLE_CARFLAME:
+				entry->m_ppRaster = &gpFlame1Raster;
+				break;
+			
+			case PARTICLE_FIREBALL:
+				entry->m_ppRaster = &gpFlame5Raster;
+				break;
+			
 			case PARTICLE_GUNFLASH:
 			case PARTICLE_GUNFLASH_NOANIM:
 				entry->m_ppRaster = gpGunFlashRaster;
 				break;
-
+			
+			
 			case PARTICLE_GUNSMOKE:
-			case PARTICLE_SPLASH:
+			case PARTICLE_WATERDROP:
+			case PARTICLE_BLOODDROP:
+			case PARTICLE_HEATHAZE:
+			case PARTICLE_HEATHAZE_IN_DIST:
 				entry->m_ppRaster = nil;
 				break;
-
-			case PARTICLE_FLAME:
-			case PARTICLE_CARFLAME:
-				entry->m_ppRaster = &gpFlame1Raster;
+			
+			case PARTICLE_GUNSMOKE2:
+			case PARTICLE_BOAT_THRUSTJET:
+			case PARTICLE_RUBBER_SMOKE:
+				entry->m_ppRaster = gpRubberRaster;
 				break;
-
-			case PARTICLE_FIREBALL:
-				entry->m_ppRaster = &gpFlame5Raster;
+			
+			case PARTICLE_CIGARETTE_SMOKE:
+				entry->m_ppRaster = &gpGunSmokeRaster;
 				break;
-
+			
+			case PARTICLE_TEARGAS:
+				entry->m_ppRaster = &gpHeathazeRaster;
+				break;
+			
+			case PARTICLE_SHARD:
+			case PARTICLE_RAINDROP:
+			case PARTICLE_RAINDROP_2D:
+				entry->m_ppRaster = &gpRainDropRaster;
+				break;
+			
+			case PARTICLE_SPLASH:
+			case PARTICLE_PED_SPLASH:
+			case PARTICLE_CAR_SPLASH:
+			case PARTICLE_WATER_HYDRANT:
+				entry->m_ppRaster = gpCarSplashRaster;
+				break;
+			
 			case PARTICLE_RAIN_SPLASH:
 			case PARTICLE_RAIN_SPLASH_BIGGROW:
 				entry->m_ppRaster = gpRainSplashRaster;
 				break;
-
+			
 			case PARTICLE_RAIN_SPLASHUP:
 				entry->m_ppRaster = gpRainSplashupRaster;
 				break;
-
+			
 			case PARTICLE_WATERSPRAY:
 				entry->m_ppRaster = gpWatersprayRaster;
 				break;
-
-			case PARTICLE_SHARD:
-			case PARTICLE_RAINDROP:
-			case PARTICLE_RAINDROP_2D:
-				entry->m_ppRaster = gpRainDropRaster;
-				break;
-
+			
 			case PARTICLE_EXPLOSION_MEDIUM:
 			case PARTICLE_EXPLOSION_LARGE:
 			case PARTICLE_EXPLOSION_MFAST:
 			case PARTICLE_EXPLOSION_LFAST:
 				entry->m_ppRaster = gpExplosionMediumRaster;
 				break;
-
-			case PARTICLE_BOAT_WAKE:
-				entry->m_ppRaster = &gpWakeOldRaster;
-				break;
-
-			case PARTICLE_CAR_SPLASH:
-			case PARTICLE_WATER_HYDRANT:
-			case PARTICLE_PED_SPLASH:
-				entry->m_ppRaster = gpCarSplashRaster;
-				break;
-
-			case PARTICLE_SPARK:
-			case PARTICLE_SPARK_SMALL:
-			case PARTICLE_RAINDROP_SMALL:
-			case PARTICLE_HELI_ATTACK:
-				entry->m_ppRaster = &gpRainDropSmallRaster;
-				break;
-
-			case PARTICLE_DEBRIS:
-			case PARTICLE_TREE_LEAVES:
-				entry->m_ppRaster = &gpLeafRaster;
-				break;
-
-			case PARTICLE_CAR_DEBRIS:
-			case PARTICLE_HELI_DEBRIS:
-				entry->m_ppRaster = gpCarDebrisRaster;
-				break;
-
-			case PARTICLE_WHEEL_DIRT:
-			case PARTICLE_STEAM2:
-			case PARTICLE_STEAM_NY:
-			case PARTICLE_STEAM_NY_SLOWMOTION:
-			case PARTICLE_ENGINE_STEAM:
-			case PARTICLE_BOAT_THRUSTJET:
-			case PARTICLE_PEDFOOT_DUST:
-			case PARTICLE_EXHAUST_FUMES:
-				entry->m_ppRaster = gpSmoke2Raster;
+			
+			case PARTICLE_BOAT_SPLASH:
+				entry->m_ppRaster = &gpBoatWakeRaster;
 				break;
-
-			case PARTICLE_GUNSMOKE2:
-			case PARTICLE_RUBBER_SMOKE:
-				entry->m_ppRaster = gpRubberRaster;
+			
+			case PARTICLE_ENGINE_SMOKE:
+			case PARTICLE_ENGINE_SMOKE2:
+			case PARTICLE_CARFLAME_SMOKE:
+			case PARTICLE_FIREBALL_SMOKE:
+			case PARTICLE_ROCKET_SMOKE:
+			case PARTICLE_TEST:
+				entry->m_ppRaster = &gpCloudRaster4;
 				break;
-
+			
 			case PARTICLE_CARCOLLISION_DUST:
 			case PARTICLE_BURNINGRUBBER_SMOKE:
 				entry->m_ppRaster = &gpCollisionSmokeRaster;
 				break;
-
-			case PARTICLE_WHEEL_WATER:
-			case PARTICLE_WATER:
-			case PARTICLE_SMOKE:
-			case PARTICLE_SMOKE_SLOWMOTION:
-			case PARTICLE_GARAGEPAINT_SPRAY:
-			case PARTICLE_STEAM:
-			case PARTICLE_BOAT_SPLASH:
-			case PARTICLE_WATER_CANNON:
-			case PARTICLE_EXTINGUISH_STEAM:
-			case PARTICLE_HELI_DUST:
-			case PARTICLE_PAINT_SMOKE:
-			case PARTICLE_BULLETHIT_SMOKE:
-				entry->m_ppRaster = gpSmokeRaster;
+			
+			case PARTICLE_CAR_DEBRIS:
+			case PARTICLE_HELI_DEBRIS:
+			case PARTICLE_BIRD_DEBRIS:
+				entry->m_ppRaster = gpCarDebrisRaster;
 				break;
-
+			
 			case PARTICLE_GUNSHELL_FIRST:
 			case PARTICLE_GUNSHELL:
 			case PARTICLE_GUNSHELL_BUMP1:
 			case PARTICLE_GUNSHELL_BUMP2:
 				entry->m_ppRaster = &gpGunShellRaster;
 				break;
-
-			case PARTICLE_ENGINE_SMOKE:
-			case PARTICLE_ENGINE_SMOKE2:
-			case PARTICLE_CARFLAME_SMOKE:
-			case PARTICLE_FIREBALL_SMOKE:
-			case PARTICLE_TEST:
-				entry->m_ppRaster = &gpCloudRaster4;
-				break;
-
+			
+			
 			case PARTICLE_BIRD_FRONT:
 				entry->m_ppRaster = gpBirdfrontRaster;
 				break;
+			
+			case PARTICLE_SHIP_SIDE:
+				entry->m_ppRaster = gpBoatRaster;
+				break;
+			
+			case PARTICLE_BEASTIE:
+				entry->m_ppRaster = &gpBeastieRaster;
+				break;
 		}
 	}
 
@@ -590,168 +677,145 @@ void CParticle::Shutdown()
 	for ( int32 i = 0; i < MAX_SMOKE_FILES; i++ )
 	{
 		RwTextureDestroy(gpSmokeTex[i]);
-#ifdef GTA3_1_1_PATCH
 		gpSmokeTex[i] = nil;
-#endif
 	}
 
-	for ( int32 i = 0; i < MAX_SMOKE2_FILES; i++ )
-	{
-		RwTextureDestroy(gpSmoke2Tex[i]);
-#ifdef GTA3_1_1_PATCH
-		gpSmoke2Tex[i] = nil;
-#endif
-	}
+	RwTextureDestroy(gpSmoke2Tex);
+	gpSmoke2Tex = nil;
 	 
 	for ( int32 i = 0; i < MAX_RUBBER_FILES; i++ )
 	{
 		RwTextureDestroy(gpRubberTex[i]);
-#ifdef GTA3_1_1_PATCH
 		gpRubberTex[i] = nil;
-#endif
 	}
 	
 	for ( int32 i = 0; i < MAX_RAINSPLASH_FILES; i++ )
 	{
 		RwTextureDestroy(gpRainSplashTex[i]);
-#ifdef GTA3_1_1_PATCH
 		gpRainSplashTex[i] = nil;
-#endif
 	}
 	
 	for ( int32 i = 0; i < MAX_WATERSPRAY_FILES; i++ )
 	{
 		RwTextureDestroy(gpWatersprayTex[i]);
-#ifdef GTA3_1_1_PATCH
 		gpWatersprayTex[i] = nil;
-#endif
 	}
 	
 	for ( int32 i = 0; i < MAX_EXPLOSIONMEDIUM_FILES; i++ )
 	{
 		RwTextureDestroy(gpExplosionMediumTex[i]);
-#ifdef GTA3_1_1_PATCH
 		gpExplosionMediumTex[i] = nil;
-#endif
 	}
 	
 	for ( int32 i = 0; i < MAX_GUNFLASH_FILES; i++ )
 	{
 		RwTextureDestroy(gpGunFlashTex[i]);
-#ifdef GTA3_1_1_PATCH
 		gpGunFlashTex[i] = nil;
-#endif
 	}
 	
-	for ( int32 i = 0; i < MAX_RAINDROP_FILES; i++ )
-	{
-		RwTextureDestroy(gpRainDropTex[i]);
-#ifdef GTA3_1_1_PATCH
-		gpRainDropTex[i] = nil;
-#endif
-	}
+	RwTextureDestroy(gpRainDropTex);
+	gpRainDropTex = nil;
 	
 	for ( int32 i = 0; i < MAX_RAINSPLASHUP_FILES; i++ )
 	{
 		RwTextureDestroy(gpRainSplashupTex[i]);
-#ifdef GTA3_1_1_PATCH
 		gpRainSplashupTex[i] = nil;
-#endif
 	}
 	
 	for ( int32 i = 0; i < MAX_BIRDFRONT_FILES; i++ )
 	{
 		RwTextureDestroy(gpBirdfrontTex[i]);
-#ifdef GTA3_1_1_PATCH
 		gpBirdfrontTex[i] = nil;
-#endif
+	}
+	
+	for ( int32 i = 0; i < MAX_BOAT_FILES; i++ )
+	{
+		RwTextureDestroy(gpBoatTex[i]);
+		gpBoatTex[i] = nil;
 	}
 	
 	for ( int32 i = 0; i < MAX_CARDEBRIS_FILES; i++ )
 	{
 		RwTextureDestroy(gpCarDebrisTex[i]);
-#ifdef GTA3_1_1_PATCH
 		gpCarDebrisTex[i] = nil;
-#endif
 	}
 	
 	for ( int32 i = 0; i < MAX_CARSPLASH_FILES; i++ )
 	{
 		RwTextureDestroy(gpCarSplashTex[i]);
-#ifdef GTA3_1_1_PATCH
 		gpCarSplashTex[i] = nil;
-#endif
 	}
 	
+	for ( int32 i = 0; i < MAX_RAINDRIP_FILES; i++ )
+	{
+		RwTextureDestroy(gpRaindripTex1[i]);
+		gpRaindripTex1[i] = nil;
+
+		RwTextureDestroy(gpRaindripTex2[i]);
+		gpRaindripTex2[i] = nil;
+	}
+	
+	RwTextureDestroy(gpBoatWakeTex);
+	gpBoatWakeTex = nil;
+
 	RwTextureDestroy(gpFlame1Tex);
-#ifdef GTA3_1_1_PATCH
 	gpFlame1Tex = nil;
-#endif
 
 	RwTextureDestroy(gpFlame5Tex);
-#ifdef GTA3_1_1_PATCH
 	gpFlame5Tex = nil;
-#endif
 	
 	RwTextureDestroy(gpRainDropSmallTex);
-#ifdef GTA3_1_1_PATCH
 	gpRainDropSmallTex = nil;
-#endif
 	
 	RwTextureDestroy(gpBloodTex);
-#ifdef GTA3_1_1_PATCH
 	gpBloodTex = nil;
-#endif
 	
 	RwTextureDestroy(gpLeafTex);
-#ifdef GTA3_1_1_PATCH
 	gpLeafTex = nil;
-#endif
+
+	RwTextureDestroy(gpLetterTex);
+	gpLetterTex = nil;
 	
 	RwTextureDestroy(gpCloudTex1);
-#ifdef GTA3_1_1_PATCH
 	gpCloudTex1 = nil;
-#endif
 	
 	RwTextureDestroy(gpCloudTex4);
-#ifdef GTA3_1_1_PATCH
 	gpCloudTex4 = nil;
-#endif
 	
 	RwTextureDestroy(gpBloodSmallTex);
-#ifdef GTA3_1_1_PATCH
 	gpBloodSmallTex = nil;
-#endif
 	
 	RwTextureDestroy(gpGungeTex);
-#ifdef GTA3_1_1_PATCH
 	gpGungeTex = nil;
-#endif
 	
 	RwTextureDestroy(gpCollisionSmokeTex);
-#ifdef GTA3_1_1_PATCH
 	gpCollisionSmokeTex = nil;
-#endif
 	
 	RwTextureDestroy(gpBulletHitTex);
-#ifdef GTA3_1_1_PATCH
 	gpBulletHitTex = nil;
-#endif
 	
 	RwTextureDestroy(gpGunShellTex);
-#ifdef GTA3_1_1_PATCH
 	gpGunShellTex = nil;
-#endif
-	
-	RwTextureDestroy(gpWakeOldTex);
-#ifdef GTA3_1_1_PATCH
-	gpWakeOldTex = nil;
-#endif
 	
 	RwTextureDestroy(gpPointlightTex);
-#ifdef GTA3_1_1_PATCH
 	gpPointlightTex = nil;
-#endif
+
+	RwTextureDestroy(gpSparkTex);
+	gpSparkTex = nil;
+	
+	RwTextureDestroy(gpNewspaperTex);
+	gpNewspaperTex = nil;
+
+	RwTextureDestroy(gpGunSmokeTex);
+	gpGunSmokeTex = nil;
+	
+	RwTextureDestroy(gpDotTex);
+	gpDotTex = nil;
+	RwTextureDestroy(gpHeathazeTex);
+	gpHeathazeTex = nil;
+	
+	RwTextureDestroy(gpBeastieTex);
+	gpBeastieTex = nil;
 
 	int32 slot;
 
@@ -761,6 +825,40 @@ void CParticle::Shutdown()
 	debug("CParticle shut down");
 }
 
+
+void CParticle::AddParticlesAlongLine(tParticleType type, CVector const &vecStart, CVector const &vecEnd, CVector const &vecDir, float fPower, CEntity *pEntity, float fSize, int32 nRotationSpeed, int32 nRotation, int32 nCurFrame, int32 nLifeSpan)
+{
+	CVector vecDist = vecEnd - vecStart;
+	float fDist = vecDist.Magnitude();
+	float fSteps = Max(fDist / fPower, 1.0f);
+	int32 nSteps = (int32)fSteps;
+
+	CVector vecStep = vecDist * (1.0f / (float)nSteps); 
+
+	for ( int32 i = 0; i < nSteps; i++ )
+	{
+		CVector vecPos = float(i) * vecStep + vecStart;
+		AddParticle(type, vecPos, vecDir, pEntity, fSize, nRotationSpeed, nRotation, nCurFrame, nLifeSpan);
+	}
+}
+
+void CParticle::AddParticlesAlongLine(tParticleType type, CVector const &vecStart, CVector const &vecEnd, CVector const &vecDir, float fPower, CEntity *pEntity, float fSize, RwRGBA const &color, int32 nRotationSpeed, int32 nRotation, int32 nCurFrame, int32 nLifeSpan)
+{
+	CVector vecDist = vecEnd - vecStart;
+	float fDist = vecDist.Magnitude();
+	float fSteps = Max(fDist / fPower, 1.0f);
+	int32 nSteps = (int32)fSteps;
+	
+	CVector vecStep = vecDist * (1.0f / (float)nSteps); 
+
+	for ( int32 i = 0; i < nSteps; i++ )
+	{		
+		CVector vecPos = float(i) * vecStep + vecStart;
+		
+		AddParticle(type, vecPos, vecDir, pEntity, fSize, color, nRotationSpeed, nRotation, nCurFrame, nLifeSpan);
+	}
+}
+
 CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVector const &vecDir, CEntity *pEntity, float fSize, int32 nRotationSpeed, int32 nRotation, int32 nCurFrame, int32 nLifeSpan)
 {
 	CRGBA color(0, 0, 0, 0);
@@ -770,9 +868,8 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe
 CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVector const &vecDir, CEntity *pEntity, float fSize, RwRGBA const &color, int32 nRotationSpeed, int32 nRotation, int32 nCurFrame, int32 nLifeSpan)
 {
 	if ( CTimer::GetIsPaused() )
-		return NULL;
+		return nil;
 
-#ifdef PC_PARTICLE
 	if ( ( type == PARTICLE_ENGINE_SMOKE
 		|| type == PARTICLE_ENGINE_SMOKE2
 		|| type == PARTICLE_ENGINE_STEAM
@@ -785,8 +882,10 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe
 	{
 		return nil;
 	}
-#endif
 
+	if ( !CReplay::IsPlayingBack() )
+		CReplay::RecordParticle(type, vecPos, vecDir, fSize, color);
+	
 	CParticle *pParticle = m_pUnusedListHead;
 	
 	if ( pParticle == nil )
@@ -807,7 +906,19 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe
 		pParticle->m_nTimeWhenWillBeDestroyed = CTimer::GetTimeInMilliseconds() + psystem->m_nLifeSpan;
 
 	pParticle->m_nColorIntensity = psystem->m_nFadeToBlackInitialIntensity;
+	
+	pParticle->m_nFadeToBlackTimer = psystem->m_nFadeToBlackAmount;
+	
+	if ( psystem->m_nFadeToBlackTime )
+		pParticle->m_nFadeToBlackTimer /= psystem->m_nFadeToBlackTime;
+	
 	pParticle->m_nAlpha = psystem->m_nFadeAlphaInitialIntensity;
+	
+	pParticle->m_nFadeAlphaTimer = psystem->m_nFadeAlphaAmount;
+	
+	if ( psystem->m_nFadeAlphaTime )
+		pParticle->m_nFadeAlphaTimer /= psystem->m_nFadeAlphaTime;
+	
 	pParticle->m_nCurrentZRotation = psystem->m_nZRotationInitialAngle;
 	pParticle->m_fCurrentZRadius = psystem->m_fInitialZRadius;
 	
@@ -816,14 +927,29 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe
 	else
 		pParticle->m_nCurrentFrame = psystem->m_nStartAnimationFrame;
 	
-	pParticle->m_nFadeToBlackTimer = 0;
-	pParticle->m_nFadeAlphaTimer = 0;
+	
 	pParticle->m_nZRotationTimer = 0;
 	pParticle->m_nZRadiusTimer = 0;
 	pParticle->m_nAnimationSpeedTimer = 0;
 	pParticle->m_fZGround = 0.0f;
-	pParticle->m_vecPosition = vecPos;
+	
+	if ( type != PARTICLE_HEATHAZE )
+		pParticle->m_vecPosition = vecPos;
+	else
+	{
+		CVector screen;
+		float w, h;
+
+		if ( !CSprite::CalcScreenCoors(vecPos, screen, &w, &h, true) )
+			return nil;
+		
+		pParticle->m_vecPosition = screen;
+		psystem->m_vecTextureStretch.x = w;
+		psystem->m_vecTextureStretch.y = h;
+	}
+	
 	pParticle->m_vecVelocity = vecDir;
+	
 	pParticle->m_vecParticleMovementOffset = CVector(0.0f, 0.0f, 0.0f);
 	pParticle->m_nTimeWhenColorWillBeChanged = 0;
 	
@@ -831,7 +957,7 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe
 		RwRGBAAssign(&pParticle->m_Color, &color);
 	else
 	{
-		RwRGBAAssign(&pParticle->m_Color, &psystem->m_RenderColouring);
+		RwRGBAAssign(&pParticle->m_Color, psystem->m_RenderColouring);
 
 		if ( psystem->m_ColorFadeTime != 0 )
 			pParticle->m_nTimeWhenColorWillBeChanged = CTimer::GetTimeInMilliseconds() + psystem->m_ColorFadeTime;
@@ -839,7 +965,7 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe
 		if ( psystem->m_InitialColorVariation != 0 )
 		{
 			int32 ColorVariation = CGeneral::GetRandomNumberInRange(-psystem->m_InitialColorVariation, psystem->m_InitialColorVariation);
-			//Float ColorVariation = CGeneral::GetRandomNumberInRange((float)-psystem->m_InitialColorVariation, (float)psystem->m_InitialColorVariation);
+			//float ColorVariation = CGeneral::GetRandomNumberInRange((float)-psystem->m_InitialColorVariation, (float)psystem->m_InitialColorVariation);
   
 			pParticle->m_Color.red   = clamp(pParticle->m_Color.red +
 				PERCENT(pParticle->m_Color.red, ColorVariation),
@@ -856,13 +982,7 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe
 	}
 
 	pParticle->m_nRotation = nRotation;
-	
-// PC only
-	if ( pParticle->m_nRotation >= 360 )
-		pParticle->m_nRotation -= 360;
-	else if ( pParticle->m_nRotation < 0 )
-		pParticle->m_nRotation += 360;
-	
+		
 	if ( nRotationSpeed != 0 )
 		pParticle->m_nRotationStep = nRotationSpeed;
 	else
@@ -871,8 +991,6 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe
 	if ( CGeneral::GetRandomNumber() & 1 )
 		pParticle->m_nRotationStep = -pParticle->m_nRotationStep;
 	
-	pParticle->m_vecScreenPosition.x = 0.0f; // bug ?
-	
 	if ( psystem->m_fPositionRandomError != 0.0f )
 	{
 		pParticle->m_vecPosition.x += psystem->m_fPositionRandomError * ms_afRandTable[CGeneral::GetRandomNumber() % RAND_TABLE_SIZE];
@@ -891,7 +1009,7 @@ CParticle *CParticle::AddParticle(tParticleType type, CVector const &vecPos, CVe
 			pParticle->m_vecVelocity.z += psystem->m_fVelocityRandomError * ms_afRandTable[CGeneral::GetRandomNumber() % RAND_TABLE_SIZE];
 	}
 	
-	if ( psystem->m_fExpansionRateError != 0.0f )
+	if ( psystem->m_fExpansionRateError != 0.0f && !(psystem->Flags & SCREEN_TRAIL) )
 		pParticle->m_fExpansionRate += psystem->m_fExpansionRateError * ms_afRandTable[CGeneral::GetRandomNumber() % RAND_TABLE_SIZE] + psystem->m_fExpansionRateError;
 	
 	if ( psystem->m_nRotationRateError != 0 )
@@ -1028,9 +1146,199 @@ void CParticle::Update()
 				
 		for ( ; particle != nil; _Next(particle, prevParticle, psystem, bRemoveParticle) )
 		{
+			CVector vecWind(0.0f, 0.0f, 0.0f);
+			
 			bRemoveParticle = false;
 
-			CVector moveStep = particle->m_vecPosition + ( particle->m_vecVelocity * CTimer::GetTimeStep() );
+			CVector vecMoveStep = particle->m_vecVelocity * CTimer::GetTimeStep();
+			CVector vecPos = particle->m_vecPosition;
+			
+			if ( numWaterDropOnScreen == 0 )
+				clearWaterDrop = false;
+			
+			if ( psystem->m_Type == PARTICLE_WATERDROP )
+			{
+				if ( CGame::IsInInterior() || clearWaterDrop == true )
+				{
+					bRemoveParticle = true;
+					continue;
+				}
+				
+				static uint8 nWaterDropCount;
+
+				if ( nWaterDropCount == 5 )
+				{
+					vecMoveStep = CVector(0.0f, 0.0f, 0.0f);
+					particle->m_nTimeWhenWillBeDestroyed += 1250;
+					nWaterDropCount = 0;
+				}
+				else
+				{
+					if ( TheCamera.m_CameraAverageSpeed > 0.35f )
+					{
+						if ( vecMoveStep.Magnitude() > 0.5f )
+						{
+							if ( vecMoveStep.Magnitude() > 0.4f && vecMoveStep.Magnitude() < 0.8f )
+							{
+								vecMoveStep.x += TheCamera.m_CameraAverageSpeed * 1.5f;
+								vecMoveStep.y += TheCamera.m_CameraAverageSpeed * 1.5f;
+							}
+							else if ( vecMoveStep.Magnitude() != 0.0f )
+							{
+								vecMoveStep.x += CGeneral::GetRandomNumberInRange(0.01f, 0.05f);
+								vecMoveStep.y += CGeneral::GetRandomNumberInRange(0.01f, 0.05f);
+							}
+						}
+					}
+					
+					nWaterDropCount++;
+				}
+				
+				if ( vecPos.z <= 1.5f )
+					vecMoveStep.z = 0.0f;
+			}
+			
+			if ( psystem->m_Type == PARTICLE_HEATHAZE || psystem->m_Type == PARTICLE_HEATHAZE_IN_DIST )
+			{
+				int32 nSinCosIndex = int32(DEGTORAD((float)particle->m_nRotation) * float(SIN_COS_TABLE_SIZE) / TWOPI) % SIN_COS_TABLE_SIZE;
+				
+				vecMoveStep.x = Sin(nSinCosIndex);
+				vecMoveStep.y = Sin(nSinCosIndex);
+				
+				if ( psystem->m_Type == PARTICLE_HEATHAZE_IN_DIST )
+					particle->m_nRotation = int16((float)particle->m_nRotation + 0.75f);
+				else
+					particle->m_nRotation = int16((float)particle->m_nRotation + 1.0f);
+			}
+			
+			if ( psystem->m_Type == PARTICLE_BEASTIE )
+			{
+				int32 nSinCosIndex = int32(DEGTORAD((float)particle->m_nRotation) * float(SIN_COS_TABLE_SIZE) / TWOPI) % SIN_COS_TABLE_SIZE;
+				
+				particle->m_vecVelocity.x = 0.50f * Cos(nSinCosIndex);
+				particle->m_vecVelocity.y = Cos(nSinCosIndex);
+				particle->m_vecVelocity.z = 0.25f * Sin(nSinCosIndex);
+				
+				if ( particle->m_vecVelocity.Magnitude() > 2.0f
+						|| vecPos.z > 40.0f
+						|| (TheCamera.GetPosition() - vecPos).Magnitude() < 60.0f
+					)
+				{
+					bRemoveParticle = true;
+					continue;
+				}
+			}
+			
+			vecPos += vecMoveStep;
+			
+			if ( psystem->m_Type == PARTICLE_FIREBALL )
+			{
+				  AddParticle(PARTICLE_HEATHAZE, particle->m_vecPosition, CVector(0.0f, 0.0f, 0.0f),
+					nil, particle->m_fSize * 5.0f);
+			}
+			
+			if ( psystem->m_Type == PARTICLE_GUNSMOKE2 )
+			{
+				if ( CTimer::GetFrameCounter() & 10 )
+				{
+					if ( FindPlayerPed()->GetWeapon()->m_eWeaponType == WEAPONTYPE_MINIGUN )
+					{
+						AddParticle(PARTICLE_HEATHAZE, particle->m_vecPosition, CVector(0.0f, 0.0f, 0.0f));
+					}
+				}
+			}
+			
+			if ( CWeather::Wind > 0.0f )
+			{
+				if ( vecMoveStep.Magnitude() != 0.0f )
+				{
+					vecWind.x = CGeneral::GetRandomNumberInRange(0.75f, 1.25f) * -CWeather::Wind;
+					vecWind.y = CGeneral::GetRandomNumberInRange(0.75f, 1.25f) * -CWeather::Wind;
+					vecWind *= PARTICLE_WIND_TEST_SCALE * psystem->m_fWindFactor * CTimer::GetTimeStep();
+					particle->m_vecVelocity += vecWind;
+				}
+			}
+			
+			if ( psystem->m_Type == PARTICLE_RAINDROP
+				|| psystem->m_Type == PARTICLE_RAINDROP_SMALL
+				|| psystem->m_Type == PARTICLE_RAIN_SPLASH
+				|| psystem->m_Type == PARTICLE_RAIN_SPLASH_BIGGROW
+				|| psystem->m_Type == PARTICLE_CAR_SPLASH
+				|| psystem->m_Type == PARTICLE_BOAT_SPLASH
+				|| psystem->m_Type == PARTICLE_RAINDROP_2D )
+			{
+				int32 nMaxDrops = int32(6.0f * TheCamera.m_CameraAverageSpeed + 1.0f);
+				float fDistToCam = 0.0f;
+				
+				if ( psystem->m_Type == PARTICLE_BOAT_SPLASH || psystem->m_Type == PARTICLE_CAR_SPLASH )
+				{
+					if ( vecPos.z + particle->m_fSize < 5.0f )
+					{
+						bRemoveParticle = true;
+						continue;
+					}
+					
+					switch ( TheCamera.GetLookDirection() )
+					{
+						case LOOKING_LEFT:
+						case LOOKING_RIGHT:
+						case LOOKING_FORWARD:
+							nMaxDrops /= 2;
+							break;
+						
+						default:
+							nMaxDrops = 0;
+							break;
+					}
+					
+					fDistToCam = (TheCamera.GetPosition() - vecPos).Magnitude();
+				}
+
+				if ( numWaterDropOnScreen < nMaxDrops && numWaterDropOnScreen < 63
+					&& fDistToCam < 10.0f
+					&& clearWaterDrop == false
+					&& !CGame::IsInInterior() )
+				{
+					CVector vecWaterdropTarget
+					(
+						CGeneral::GetRandomNumberInRange(-0.25f, 0.25f),
+						CGeneral::GetRandomNumberInRange(0.1f, 0.75f),
+						-0.01f
+					);
+					
+					CVector vecWaterdropPos;
+					
+					if ( TheCamera.m_CameraAverageSpeed < 0.35f )
+						vecWaterdropPos.x = (float)CGeneral::GetRandomNumberInRange(50, int32(SCREEN_WIDTH) - 50);
+					else
+						vecWaterdropPos.x = (float)CGeneral::GetRandomNumberInRange(200, int32(SCREEN_WIDTH) - 200);
+					
+					if ( psystem->m_Type == PARTICLE_BOAT_SPLASH || psystem->m_Type == PARTICLE_CAR_SPLASH )
+						vecWaterdropPos.y = (float)CGeneral::GetRandomNumberInRange(SCREEN_HEIGHT / 2, SCREEN_HEIGHT);
+					else
+					{
+						if ( TheCamera.m_CameraAverageSpeed < 0.35f )
+							vecWaterdropPos.y  = (float)CGeneral::GetRandomNumberInRange(0, int32(SCREEN_HEIGHT));
+						else
+							vecWaterdropPos.y  = (float)CGeneral::GetRandomNumberInRange(150, int32(SCREEN_HEIGHT) - 200);
+					}
+					
+					vecWaterdropPos.z = 2.0f;
+
+					if ( AddParticle(PARTICLE_WATERDROP,
+										vecWaterdropPos,
+										vecWaterdropTarget,
+										nil,
+										CGeneral::GetRandomNumberInRange(0.1f, 0.15f),
+										0,
+										0,
+										CGeneral::GetRandomNumber() & 1,
+										0) != nil )
+					{
+						numWaterDropOnScreen++;
+					}
+				}
+			}
 			
 			if (  CTimer::GetTimeInMilliseconds() > particle->m_nTimeWhenWillBeDestroyed || particle->m_nAlpha == 0 )
 			{
@@ -1057,7 +1365,7 @@ void CParticle::Update()
 						0, 255);
 				}
 				else
-					RwRGBAAssign(&particle->m_Color, &psystem->m_FadeDestinationColor);
+					RwRGBAAssign(&particle->m_Color, psystem->m_FadeDestinationColor);
 			}
 			
 			if ( psystem->Flags & CLIPOUT2D )
@@ -1070,16 +1378,41 @@ void CParticle::Update()
 				}
 			}
 			
-			float size = particle->m_fSize + particle->m_fExpansionRate;
-			
-			if ( size < 0.0f )
+			if ( !(psystem->Flags & SCREEN_TRAIL) )
 			{
-				bRemoveParticle = true;
-				continue;
+				float size;
+
+				if ( particle->m_fExpansionRate > 0.0f )
+				{
+					float speed = Max(vecWind.Magnitude(), vecMoveStep.Magnitude());
+					
+					if ( psystem->m_Type == PARTICLE_EXHAUST_FUMES || psystem->m_Type == PARTICLE_ENGINE_STEAM )
+						speed *= 2.0f;
+					
+					if ( ( psystem->m_Type == PARTICLE_BOAT_SPLASH || psystem->m_Type == PARTICLE_CAR_SPLASH )
+							&& particle->m_fSize > 1.2f )
+					{
+						size = particle->m_fSize - (1.0f + speed) * particle->m_fExpansionRate;
+						particle->m_vecVelocity.z -= 0.15f;
+					}
+					else
+						size = particle->m_fSize + (1.0f + speed) * particle->m_fExpansionRate;
+				}
+				else
+					size = particle->m_fSize + particle->m_fExpansionRate;
+				
+				if ( psystem->m_Type == PARTICLE_WATERDROP )
+					size = (size - Abs(vecMoveStep.x) * 0.000150000007f) + (Abs(vecMoveStep.z) * 0.0500000007f); //TODO:
+				
+				if ( size < 0.0f )
+				{
+					bRemoveParticle = true;
+					continue;
+				}
+				
+				particle->m_fSize = size;
 			}
 			
-			particle->m_fSize = size;
-			
 			switch ( psystem->m_nFrictionDecceleration )
 			{
 				case 50:
@@ -1199,7 +1532,7 @@ void CParticle::Update()
 									
 									if ( randVal == 5 )
 									{
-										CShadows::AddPermanentShadow(1, gpBloodPoolTex, &vecPosn,
+										CShadows::AddPermanentShadow(SHADOWTYPE_DARK, gpBloodPoolTex, &vecPosn,
 												0.1f, 0.0f, 0.0f, -0.1f,
 												255,
 												255, 0, 0,
@@ -1207,7 +1540,7 @@ void CParticle::Update()
 									}
 									else if ( randVal == 2 )
 									{
-										CShadows::AddPermanentShadow(1, gpBloodPoolTex, &vecPosn,
+										CShadows::AddPermanentShadow(SHADOWTYPE_DARK, gpBloodPoolTex, &vecPosn,
 												0.2f, 0.0f, 0.0f, -0.2f,
 												255,
 												255, 0, 0,
@@ -1225,12 +1558,12 @@ void CParticle::Update()
 					CColPoint point;
 					CEntity *entity;
 
-					if ( CWorld::ProcessVerticalLine(particle->m_vecPosition, moveStep.z, point, entity, 
+					if ( CWorld::ProcessVerticalLine(particle->m_vecPosition, vecPos.z, point, entity, 
 														true, true, false, false, true, false, nil) )
 					{
-						if ( moveStep.z <= point.point.z )
+						if ( vecPos.z <= point.point.z )
 						{
-							moveStep.z = point.point.z;
+							vecPos.z = point.point.z;
 							if ( psystem->m_Type == PARTICLE_DEBRIS2 )
 							{
 								particle->m_vecVelocity.x *= 0.8f;
@@ -1317,16 +1650,16 @@ void CParticle::Update()
 						CColPoint point;
 						CEntity *entity;
 			
-						if ( CWorld::ProcessVerticalLine(particle->m_vecPosition, moveStep.z, point, entity,
+						if ( CWorld::ProcessVerticalLine(particle->m_vecPosition, vecPos.z, point, entity,
 														true, false, false, false, true, false, nil) )
 						{
-							if ( moveStep.z <= point.point.z )
+							if ( vecPos.z <= point.point.z )
 							{
-								moveStep.z = point.point.z;
+								vecPos.z = point.point.z;
 								if ( psystem->m_Type == PARTICLE_HELI_ATTACK )
 								{
 									bRemoveParticle = true;
-									AddParticle(PARTICLE_STEAM, moveStep, CVector(0.0f, 0.0f, 0.05f), nil, 0.2f, 0, 0, 0, 0);
+									AddParticle(PARTICLE_STEAM, vecPos, CVector(0.0f, 0.0f, 0.05f), nil, 0.2f, 0, 0, 0, 0);
 									continue;
 								}
 							}
@@ -1335,37 +1668,21 @@ void CParticle::Update()
 				}
 			}
 
-			if ( psystem->m_nFadeToBlackAmount != 0 )
+			if ( particle->m_nFadeToBlackTimer != 0 )
 			{
-				if ( particle->m_nFadeToBlackTimer >= psystem->m_nFadeToBlackTime )
-				{
-					particle->m_nFadeToBlackTimer = 0;
-					
-					particle->m_nColorIntensity = clamp(particle->m_nColorIntensity - psystem->m_nFadeToBlackAmount,
+				particle->m_nColorIntensity = clamp(particle->m_nColorIntensity - particle->m_nFadeToBlackTimer,
 														0, 255);
-				}
-				else
-					++particle->m_nFadeToBlackTimer;
 			}
 
-			if ( psystem->m_nFadeAlphaAmount != 0 )
+			if ( particle->m_nFadeAlphaTimer != 0 )
 			{
-				if ( particle->m_nFadeAlphaTimer >= psystem->m_nFadeAlphaTime )
-				{
-					particle->m_nFadeAlphaTimer = 0;
-					
-					particle->m_nAlpha = clamp(particle->m_nAlpha - psystem->m_nFadeAlphaAmount,
+				particle->m_nAlpha = clamp(particle->m_nAlpha - particle->m_nFadeAlphaTimer,
 														0, 255);
-#ifdef PC_PARTICLE
-					if ( particle->m_nAlpha == 0 )
-					{
-						bRemoveParticle = true;
-						continue;
-					}
-#endif
+				if ( particle->m_nAlpha == 0 )
+				{
+					bRemoveParticle = true;
+					continue;
 				}
-				else
-					++particle->m_nFadeAlphaTimer;
 			}
 			
 			if ( psystem->m_nZRotationAngleChangeAmount != 0 )
@@ -1409,31 +1726,24 @@ void CParticle::Update()
 			}
 			
 			if ( particle->m_nRotationStep != 0 )
-			{
 				particle->m_nRotation += particle->m_nRotationStep;
-				
-				if ( particle->m_nRotation >= 360 )
-					particle->m_nRotation -= 360;
-				else if ( particle->m_nRotation < 0 )
-					particle->m_nRotation += 360;
-			}
 			
 			if ( particle->m_fCurrentZRadius != 0.0f )
 			{
-				int32 nRot = particle->m_nCurrentZRotation % (SIN_COS_TABLE_SIZE - 1);
+				int32 nSinCosIndex = particle->m_nCurrentZRotation % SIN_COS_TABLE_SIZE;
 				
-				float fX = (Cos(nRot) - Sin(nRot)) * particle->m_fCurrentZRadius;
+				float fX = (Cos(nSinCosIndex) - Sin(nSinCosIndex)) * particle->m_fCurrentZRadius;
 				
-				float fY = (Sin(nRot) + Cos(nRot)) * particle->m_fCurrentZRadius;
+				float fY = (Sin(nSinCosIndex) + Cos(nSinCosIndex)) * particle->m_fCurrentZRadius;
 
-				moveStep -= particle->m_vecParticleMovementOffset;
+				vecPos -= particle->m_vecParticleMovementOffset;
 
-				moveStep += CVector(fX, fY, 0.0f);
+				vecPos += CVector(fX, fY, 0.0f);
 				
 				particle->m_vecParticleMovementOffset = CVector(fX, fY, 0.0f);
 			}
 			
-			particle->m_vecPosition = moveStep;
+			particle->m_vecPosition = vecPos;
 		}
 	}
 }
@@ -1457,13 +1767,10 @@ void CParticle::Render()
 	for ( int32 i = 0; i < MAX_PARTICLES; i++ )
 	{
 		tParticleSystemData *psystem = &mod_ParticleSystemManager.m_aParticles[i];
-#ifdef PC_PARTICLE
 		bool particleBanned = false;
-#endif
 		CParticle *particle = psystem->m_pParticles;
 		
 		RwRaster **frames = psystem->m_ppRaster;
-#ifdef PC_PARTICLE
 		tParticleType type = psystem->m_Type;
 
 		if ( type == PARTICLE_ENGINE_SMOKE
@@ -1477,7 +1784,6 @@ void CParticle::Render()
 		{
 			particleBanned = true;
 		}
-#endif
 
 		if ( particle )
 		{
@@ -1519,11 +1825,10 @@ void CParticle::Render()
 		while ( particle != nil )
 		{
 			bool canDraw = true;
-#ifdef PC_PARTICLE
 
 			if ( particle->m_nAlpha == 0 )
 				canDraw = false;
-#endif
+			
 			if ( canDraw && psystem->m_nFinalAnimationFrame != 0 && frames != nil )
 			{
 				RwRaster *curFrame = frames[particle->m_nCurrentFrame];
@@ -1537,28 +1842,153 @@ void CParticle::Render()
 			
 			if ( canDraw && psystem->Flags & DRAWTOP2D )
 			{
-				if ( particle->m_nRotation != 0 )
+				float screenZ = (particle->m_vecPosition.z - CDraw::GetNearClipZ())
+					* (CSprite::GetFarScreenZ() - CSprite::GetNearScreenZ())
+					* CDraw::GetFarClipZ()
+					/ ( (CDraw::GetFarClipZ() - CDraw::GetNearClipZ()) * particle->m_vecPosition.z )
+					+ CSprite::GetNearScreenZ();
+				
+				float stretchTexW;
+				float stretchTexH;
+					
+				if ( i == PARTICLE_RAINDROP || i == PARTICLE_RAINDROP_SMALL || i == PARTICLE_RAINDROP_2D )
 				{
-					 CSprite::RenderBufferedOneXLUSprite2D_Rotate_Dimension(
-							particle->m_vecPosition.x,
-							particle->m_vecPosition.y,
-							particle->m_fSize * 63.0f,
-							particle->m_fSize * 63.0f,
-							particle->m_Color,
-							particle->m_nColorIntensity,
-							DEGTORAD(particle->m_nRotation),
-							particle->m_nAlpha);
+					stretchTexW = CGeneral::GetRandomNumberInRange(0.1f, 1.0f) * psystem->m_vecTextureStretch.x * (float)particle->m_nCurrentFrame + 63.0f;
+					stretchTexH = CGeneral::GetRandomNumberInRange(0.1f, 1.0f) * psystem->m_vecTextureStretch.y * (float)particle->m_nCurrentFrame + 63.0f;
 				}
 				else
 				{
-					CSprite::RenderBufferedOneXLUSprite2D(
-							particle->m_vecPosition.x,
-							particle->m_vecPosition.y,
-							particle->m_fSize * 63.0f,
-							particle->m_fSize * 63.0f,
-							particle->m_Color,
-							particle->m_nColorIntensity,
-							particle->m_nAlpha);
+					stretchTexW = CGeneral::GetRandomNumberInRange(0.1f, 1.0f) * psystem->m_vecTextureStretch.x + 63.0f;
+					stretchTexH = CGeneral::GetRandomNumberInRange(0.1f, 1.0f) * psystem->m_vecTextureStretch.y + 63.0f;
+				}
+
+				
+				if ( i == PARTICLE_WATERDROP )
+				{
+					int32 timeLeft = (particle->m_nTimeWhenWillBeDestroyed - CTimer::GetTimeInMilliseconds()) / particle->m_nTimeWhenWillBeDestroyed;
+					
+					stretchTexH += (1.0f - (float)timeLeft ) * psystem->m_vecTextureStretch.y;
+					
+					RwRect rect;
+					
+					rect.x = int32(particle->m_vecPosition.x - SCREEN_STRETCH_X(particle->m_fSize * stretchTexW));
+					rect.y = int32(particle->m_vecPosition.y - SCREEN_STRETCH_Y(particle->m_fSize * stretchTexH));
+					rect.w = int32(particle->m_vecPosition.x + SCREEN_STRETCH_X(particle->m_fSize * stretchTexW));
+					rect.h = int32(particle->m_vecPosition.y + SCREEN_STRETCH_Y(particle->m_fSize * stretchTexH));
+					
+					FxType fxtype;
+
+					if ( particle->m_nCurrentFrame != 0 )
+						fxtype = FXTYPE_1;
+					else
+						fxtype = FXTYPE_0;
+		
+					CMBlur::AddRenderFx(Scene.camera, &rect, screenZ, fxtype);
+					
+					canDraw = false;
+				}
+				
+				if ( i == PARTICLE_BLOODDROP )
+				{
+					int32 timeLeft = (particle->m_nTimeWhenWillBeDestroyed - CTimer::GetTimeInMilliseconds()) / particle->m_nTimeWhenWillBeDestroyed;
+					
+					stretchTexH += (1.0f + (float)timeLeft) * psystem->m_vecTextureStretch.y;
+					stretchTexW += (1.0f - (float)timeLeft) * psystem->m_vecTextureStretch.x;
+
+					RwRect rect;
+
+					rect.x = int32(particle->m_vecPosition.x - SCREEN_STRETCH_X(particle->m_fSize * stretchTexW));
+					rect.y = int32(particle->m_vecPosition.y - SCREEN_STRETCH_Y(particle->m_fSize * stretchTexH));
+					rect.w = int32(particle->m_vecPosition.x + SCREEN_STRETCH_X(particle->m_fSize * stretchTexW));
+					rect.h = int32(particle->m_vecPosition.y + SCREEN_STRETCH_Y(particle->m_fSize * stretchTexH));
+					
+					FxType fxtype;
+					
+					if ( particle->m_nCurrentFrame )
+						fxtype = FXTYPE_3;
+					else
+						fxtype = FXTYPE_2;
+					
+					CMBlur::AddRenderFx(Scene.camera, &rect, screenZ, fxtype);
+					
+					canDraw = false;
+				}
+				
+				if ( i == PARTICLE_HEATHAZE_IN_DIST )
+				{
+					RwRect rect;
+					
+					rect.x = int32(particle->m_vecPosition.x - SCREEN_STRETCH_X(particle->m_fSize * stretchTexW));
+					rect.y = int32(particle->m_vecPosition.y - SCREEN_STRETCH_Y(particle->m_fSize * stretchTexH * 0.15f));
+					rect.w = int32(particle->m_vecPosition.x + SCREEN_STRETCH_X(particle->m_fSize * stretchTexW));
+					rect.h = int32(particle->m_vecPosition.y + SCREEN_STRETCH_Y(particle->m_fSize * stretchTexH * 0.15f));
+					
+					CMBlur::AddRenderFx(Scene.camera, &rect, screenZ, FXTYPE_4);
+					
+					canDraw = false;
+				}
+				
+				if ( i == PARTICLE_HEATHAZE )
+				{
+					RwRect rect;
+					
+					switch ( TheCamera.GetLookDirection() )
+					{
+						case LOOKING_LEFT:
+							rect.x = int32(particle->m_vecPosition.x - SCREEN_STRETCH_X(particle->m_fSize * psystem->m_vecTextureStretch.x * 2.0f));
+							rect.y = int32(particle->m_vecPosition.y - SCREEN_STRETCH_Y(particle->m_fSize * psystem->m_vecTextureStretch.y));
+							rect.w = int32(particle->m_vecPosition.x - SCREEN_STRETCH_X(particle->m_fSize * psystem->m_vecTextureStretch.x));
+							rect.h = int32(particle->m_vecPosition.y + SCREEN_STRETCH_Y(particle->m_fSize * psystem->m_vecTextureStretch.y));
+					
+							break;
+
+						case LOOKING_RIGHT:
+							rect.x = int32(particle->m_vecPosition.x + SCREEN_STRETCH_X(particle->m_fSize * psystem->m_vecTextureStretch.x));
+							rect.y = int32(particle->m_vecPosition.y - SCREEN_STRETCH_Y(particle->m_fSize * psystem->m_vecTextureStretch.y));
+							rect.w = int32(particle->m_vecPosition.x + SCREEN_STRETCH_X(particle->m_fSize * psystem->m_vecTextureStretch.x * 4.0f));
+							rect.h = int32(particle->m_vecPosition.y + SCREEN_STRETCH_Y(particle->m_fSize * psystem->m_vecTextureStretch.y));
+					
+							break;
+
+						default:
+							rect.x = int32(particle->m_vecPosition.x - SCREEN_STRETCH_X(particle->m_fSize * psystem->m_vecTextureStretch.x));
+							rect.y = int32(particle->m_vecPosition.y - SCREEN_STRETCH_Y(particle->m_fSize * psystem->m_vecTextureStretch.y));
+							rect.w = int32(particle->m_vecPosition.x + SCREEN_STRETCH_X(particle->m_fSize * psystem->m_vecTextureStretch.x));
+							rect.h = int32(particle->m_vecPosition.y + SCREEN_STRETCH_Y(particle->m_fSize * psystem->m_vecTextureStretch.y));
+					
+							break;
+					}
+														 
+					CMBlur::AddRenderFx(Scene.camera, &rect, screenZ, FXTYPE_4);
+					
+					canDraw = false;
+				}
+				
+				if ( canDraw )
+				{
+					if ( particle->m_nRotation != 0 )
+					{
+						CSprite::RenderBufferedOneXLUSprite2D_Rotate_Dimension(
+								particle->m_vecPosition.x,
+								particle->m_vecPosition.y,
+								particle->m_fSize * stretchTexW,
+								particle->m_fSize * stretchTexH,
+								particle->m_Color,
+								particle->m_nColorIntensity,
+								DEGTORAD((float)particle->m_nRotation),
+								particle->m_nAlpha);
+					}
+					else
+					{
+						CSprite::RenderBufferedOneXLUSprite2D(
+								particle->m_vecPosition.x,
+								particle->m_vecPosition.y,
+								particle->m_fSize * stretchTexW,
+								particle->m_fSize * stretchTexH,
+								particle->m_Color,
+								particle->m_nColorIntensity,
+								particle->m_nAlpha);
+					}
 				}
 				
 				canDraw = false;
@@ -1572,174 +2002,234 @@ void CParticle::Render()
 
 				if ( CSprite::CalcScreenCoors(particle->m_vecPosition, coors, &w, &h, true) )
 				{
-#ifdef PC_PARTICLE
-					if ( (!particleBanned || SCREEN_WIDTH * fParticleScaleLimit >= w)
-											&& SCREEN_HEIGHT * fParticleScaleLimit >= h )
-#endif
+					
+					if ( i == PARTICLE_ENGINE_STEAM
+						|| i == PARTICLE_ENGINE_SMOKE
+						|| i == PARTICLE_ENGINE_SMOKE2
+						|| i == PARTICLE_CARFLAME_SMOKE
+						|| i == PARTICLE_CARCOLLISION_DUST
+						|| i == PARTICLE_EXHAUST_FUMES
+						|| i == PARTICLE_RUBBER_SMOKE
+						|| i == PARTICLE_BURNINGRUBBER_SMOKE )
 					{
-						if ( particle->m_nRotation != 0 )
-						{					
-							CSprite::RenderBufferedOneXLUSprite_Rotate_Dimension(coors.x, coors.y, coors.z,
-									particle->m_fSize * w, particle->m_fSize * h,
-									particle->m_Color.red,
-									particle->m_Color.green,
-									particle->m_Color.blue,
-									particle->m_nColorIntensity,
-									1.0f / coors.z,
-									DEGTORAD(particle->m_nRotation),
-									particle->m_nAlpha);
+						switch ( TheCamera.GetLookDirection() )
+						{
+							case LOOKING_LEFT:
+							case LOOKING_RIGHT:
+								w += CGeneral::GetRandomNumberInRange(1.0f, 7.5f) * psystem->m_vecTextureStretch.x;
+								h += CGeneral::GetRandomNumberInRange(0.1f, 1.0f) * psystem->m_vecTextureStretch.y;
+								break;
+
+							default:
+								w += CGeneral::GetRandomNumberInRange(0.1f, 1.0f) * psystem->m_vecTextureStretch.x;
+								h += CGeneral::GetRandomNumberInRange(0.1f, 1.0f) * psystem->m_vecTextureStretch.y;
+								break;
 						}
-						else if ( psystem->Flags & SCREEN_TRAIL )
+					}
+					else if ( i == PARTICLE_WATER_HYDRANT )
+					{
+						int32 timeLeft = (particle->m_nTimeWhenWillBeDestroyed - CTimer::GetTimeInMilliseconds()) / particle->m_nTimeWhenWillBeDestroyed;
+					
+						w += (1.0f - (float)timeLeft) * psystem->m_vecTextureStretch.x;
+						h += (1.0f - (float)timeLeft) * psystem->m_vecTextureStretch.y;
+					}
+					else if ( i == PARTICLE_FLYERS )
+					{
+						w += psystem->m_vecTextureStretch.x;
+						h += psystem->m_vecTextureStretch.y;
+						
+						w = Max(w, 12.0f);
+						h = Max(h, 12.0f);
+					}
+					else
+					{
+						w += CGeneral::GetRandomNumberInRange(0.1f, 1.0f) * psystem->m_vecTextureStretch.x;
+						h += CGeneral::GetRandomNumberInRange(0.1f, 1.0f) * psystem->m_vecTextureStretch.y;
+					}
+					
+					if ( i == PARTICLE_WATER_HYDRANT
+							|| (!particleBanned || SCREEN_WIDTH * fParticleScaleLimit >= w)
+							&& SCREEN_HEIGHT * fParticleScaleLimit >= h )
+					{
+						if ( i == PARTICLE_WATER_HYDRANT )
 						{
-							float fRotation;
-							float fTrailLength;
+							RwRect rect;
 							
-							if ( particle->m_vecScreenPosition.x == 0.0f )
+							if ( w > 0.0f )
 							{
-								fTrailLength = 0.0f;
-								fRotation = 0.0f;
+								rect.x = int32(coors.x - SCREEN_STRETCH_X(particle->m_fSize * w));
+								rect.w = int32(coors.x + SCREEN_STRETCH_X(particle->m_fSize * w));
 							}
 							else
 							{
-								CVector2D vecDist
-								(
-									coors.x - particle->m_vecScreenPosition.x,
-									coors.y - particle->m_vecScreenPosition.y
-								);
-
-								float fDist = vecDist.Magnitude();
-
-								fTrailLength = fDist;
-								
-								float fRot = Asin(vecDist.x / fDist);
-
-								fRotation = fRot;
-
-								if ( vecDist.y < 0.0f )
-									fRotation = -1.0f * fRot + DEGTORAD(180.0f);
-								
-								fRotation = RADTODEG(fRotation);
-	
-								if ( fRotation < 0.0f )
-									fRotation += 360.0f;
-								
-								float fSpeed = particle->m_vecVelocity.Magnitude();
-								
-								float fNewTrailLength = fSpeed * CTimer::GetTimeStep() * w * 2.0f;
-								
-								if ( fDist > fNewTrailLength )
-									fTrailLength = fNewTrailLength;
+								rect.w = int32(coors.x - SCREEN_STRETCH_X(particle->m_fSize * w));
+								rect.x = int32(coors.x + SCREEN_STRETCH_X(particle->m_fSize * w));
 							}
 							
-							CSprite::RenderBufferedOneXLUSprite_Rotate_Dimension(coors.x, coors.y, coors.z,
-									particle->m_fSize * w,
-									particle->m_fSize * h + fTrailLength * psystem->m_fTrailLengthMultiplier,
-									particle->m_Color.red,
-									particle->m_Color.green,
-									particle->m_Color.blue,
-									particle->m_nColorIntensity,
-									1.0f / coors.z,
-									DEGTORAD(fRotation),
-									particle->m_nAlpha);
-			
-							particle->m_vecScreenPosition = coors;
+							if ( h > 0.0f )
+							{
+								rect.y = int32(coors.y - SCREEN_STRETCH_Y(particle->m_fSize * h));
+								rect.h = int32(coors.y + SCREEN_STRETCH_Y(particle->m_fSize * h));
+							}
+							else
+							{
+								rect.h = int32(coors.y - SCREEN_STRETCH_Y(particle->m_fSize * h));
+								rect.y = int32(coors.y + SCREEN_STRETCH_Y(particle->m_fSize * h));
+							}
+							
+							float screenZ = (coors.z - CDraw::GetNearClipZ())
+								* (CSprite::GetFarScreenZ() - CSprite::GetNearScreenZ()) * CDraw::GetFarClipZ()
+								/ ( (CDraw::GetFarClipZ() - CDraw::GetNearClipZ()) * coors.z ) + CSprite::GetNearScreenZ();
+
+							CMBlur::AddRenderFx(Scene.camera, &rect, screenZ, FXTYPE_5);
 						}
-						else if ( psystem->Flags & SPEED_TRAIL )
+						else
 						{
-							CVector vecPrevPos = particle->m_vecPosition - particle->m_vecVelocity;
-							float fRotation;
-							float fTrailLength;
-							
-							if ( CSprite::CalcScreenCoors(vecPrevPos, particle->m_vecScreenPosition, &fTrailLength, &fRotation, true) )
+							if ( particle->m_nRotation != 0 && i != PARTICLE_BEASTIE )
+							{					
+								CSprite::RenderBufferedOneXLUSprite_Rotate_Dimension(coors.x, coors.y, coors.z,
+										particle->m_fSize * w, particle->m_fSize * h,
+										particle->m_Color.red,
+										particle->m_Color.green,
+										particle->m_Color.blue,
+										particle->m_nColorIntensity,
+										1.0f / coors.z,
+										DEGTORAD((float)particle->m_nRotation),
+										particle->m_nAlpha);
+							}
+							else if ( psystem->Flags & SCREEN_TRAIL )
 							{
-								CVector2D vecDist
-								(
-									coors.x - particle->m_vecScreenPosition.x,
-									coors.y - particle->m_vecScreenPosition.y
-								);
-								
-								float fDist = vecDist.Magnitude();
+								float fRotation;
+								float fTrailLength;
 								
-								fTrailLength = fDist;
-								
-								float fRot = Asin(vecDist.x / fDist);
-								
-								fRotation = fRot;
+								if ( particle->m_fZGround == 0.0f )
+								{
+									fTrailLength = 0.0f;
+									fRotation = 0.0f;
+								}
+								else
+								{
+									CVector2D vecDist
+									(
+										coors.x - particle->m_fZGround,
+										coors.y - particle->m_fExpansionRate
+									);
+	
+									float fDist = vecDist.Magnitude();
+	
+									fTrailLength = fDist;
+									
+									float fRot = Asin(vecDist.x / fDist);
+	
+									fRotation = fRot;
+	
+									if ( vecDist.y < 0.0f )
+										fRotation = -1.0f * fRot + DEGTORAD(180.0f);
+									
+									float fSpeed = particle->m_vecVelocity.Magnitude();
+									
+									float fNewTrailLength = fSpeed * CTimer::GetTimeStep() * w * 2.0f;
+									
+									if ( fDist > fNewTrailLength )
+										fTrailLength = fNewTrailLength;
+								}
 								
-								if ( vecDist.y < 0.0f )
-									fRotation = -1.0f * fRot + DEGTORAD(180.0f);
+								CSprite::RenderBufferedOneXLUSprite_Rotate_Dimension(coors.x, coors.y, coors.z,
+										particle->m_fSize * w,
+										particle->m_fSize * h + fTrailLength * psystem->m_fTrailLengthMultiplier,
+										particle->m_Color.red,
+										particle->m_Color.green,
+										particle->m_Color.blue,
+										particle->m_nColorIntensity,
+										1.0f / coors.z,
+										fRotation,
+										particle->m_nAlpha);
+				
+								particle->m_fZGround = coors.x;				// WTF ?
+								particle->m_fExpansionRate =  coors.y;		// WTF ?
+							}
+							else if ( psystem->Flags & SPEED_TRAIL )
+							{
+								CVector vecPrevPos = particle->m_vecPosition - particle->m_vecVelocity;
+								float fRotation;
+								float fTrailLength;
+								CVector vecScreenPosition;
 								
-								fRotation = RADTODEG(fRotation);
+								if ( CSprite::CalcScreenCoors(vecPrevPos, vecScreenPosition, &fTrailLength, &fRotation, true) )
+								{
+									CVector2D vecDist
+									(
+										coors.x - vecScreenPosition.x,
+										coors.y - vecScreenPosition.y
+									);
+									
+									float fDist = vecDist.Magnitude();
+									
+									fTrailLength = fDist;
+									
+									float fRot = Asin(vecDist.x / fDist);
+									
+									fRotation = fRot;
+									
+									if ( vecDist.y < 0.0f )
+										fRotation = -1.0f * fRot + DEGTORAD(180.0f);
+								}
+								else
+								{
+									fRotation = 0.0f;
+									fTrailLength = 0.0f;
+								}
 								
-								if ( fRotation < 0.0f )
-									fRotation += 360.0f;
+								CSprite::RenderBufferedOneXLUSprite_Rotate_Dimension(coors.x, coors.y, coors.z,
+										particle->m_fSize * w,
+										particle->m_fSize * h + fTrailLength * psystem->m_fTrailLengthMultiplier,
+										particle->m_Color.red,
+										particle->m_Color.green,
+										particle->m_Color.blue,
+										particle->m_nColorIntensity,
+										1.0f / coors.z,
+										fRotation,
+										particle->m_nAlpha);
 							}
-							else
+							else if ( psystem->Flags & VERT_TRAIL )
 							{
-								fRotation = 0.0f;
-								fTrailLength = 0.0f;
+								float fTrailLength = fabsf(particle->m_vecVelocity.z * 10.0f);
+	
+								CSprite::RenderBufferedOneXLUSprite(coors.x, coors.y, coors.z,
+										particle->m_fSize * w,
+										(particle->m_fSize + fTrailLength * psystem->m_fTrailLengthMultiplier) * h,
+										particle->m_Color.red,
+										particle->m_Color.green,
+										particle->m_Color.blue,
+										particle->m_nColorIntensity,
+										1.0f / coors.z,
+										particle->m_nAlpha);
+							}
+							else if ( i == PARTICLE_RAINDROP_SMALL )
+							{
+								CSprite::RenderBufferedOneXLUSprite(coors.x, coors.y, coors.z,
+										particle->m_fSize * w * 0.05f,
+										particle->m_fSize * h,
+										particle->m_Color.red,
+										particle->m_Color.green,
+										particle->m_Color.blue,
+										particle->m_nColorIntensity,
+										1.0f / coors.z,
+										particle->m_nAlpha);
+							}
+							/*else if ( i == PARTICLE_BOAT_WAKE )*/
+							else
+							{							
+								CSprite::RenderBufferedOneXLUSprite(coors.x, coors.y, coors.z,
+										particle->m_fSize * w,
+										particle->m_fSize * h,
+										particle->m_Color.red,
+										particle->m_Color.green,
+										particle->m_Color.blue,
+										particle->m_nColorIntensity,
+										1.0f / coors.z,
+										particle->m_nAlpha);
 							}
-							
-							CSprite::RenderBufferedOneXLUSprite_Rotate_Dimension(coors.x, coors.y, coors.z,
-									particle->m_fSize * w,
-									particle->m_fSize * h + fTrailLength * psystem->m_fTrailLengthMultiplier,
-									particle->m_Color.red,
-									particle->m_Color.green,
-									particle->m_Color.blue,
-									particle->m_nColorIntensity,
-									1.0f / coors.z,
-									DEGTORAD(fRotation),
-									particle->m_nAlpha);
-						}
-						else if ( psystem->Flags & VERT_TRAIL )
-						{
-							float fTrailLength = fabsf(particle->m_vecVelocity.z * 10.0f);
-
-							CSprite::RenderBufferedOneXLUSprite(coors.x, coors.y, coors.z,
-									particle->m_fSize * w,
-									(particle->m_fSize + fTrailLength * psystem->m_fTrailLengthMultiplier) * h,
-									particle->m_Color.red,
-									particle->m_Color.green,
-									particle->m_Color.blue,
-									particle->m_nColorIntensity,
-									1.0f / coors.z,
-									particle->m_nAlpha);
-						}
-						else if ( i == PARTICLE_RAINDROP_SMALL )
-						{
-							CSprite::RenderBufferedOneXLUSprite(coors.x, coors.y, coors.z,
-									particle->m_fSize * w * 0.05f,
-									particle->m_fSize * h,
-									particle->m_Color.red,
-									particle->m_Color.green,
-									particle->m_Color.blue,
-									particle->m_nColorIntensity,
-									1.0f / coors.z,
-									particle->m_nAlpha);
-						}
-						else if ( i == PARTICLE_BOAT_WAKE )
-						{
-							CSprite::RenderBufferedOneXLUSprite(coors.x, coors.y, coors.z,
-									particle->m_fSize * w,
-									psystem->m_fDefaultInitialRadius * h,
-									particle->m_Color.red,
-									particle->m_Color.green,
-									particle->m_Color.blue,
-									particle->m_nColorIntensity,
-									1.0f / coors.z,
-									particle->m_nAlpha);
-						}
-						else
-						{							
-							CSprite::RenderBufferedOneXLUSprite(coors.x, coors.y, coors.z,
-									particle->m_fSize * w,
-									particle->m_fSize * h,
-									particle->m_Color.red,
-									particle->m_Color.green,
-									particle->m_Color.blue,
-									particle->m_nColorIntensity,
-									1.0f / coors.z,
-									particle->m_nAlpha);
 						}
 					}
 				}
@@ -1769,6 +2259,9 @@ void CParticle::RemovePSystem(tParticleType type)
 
 void CParticle::RemoveParticle(CParticle *pParticle, CParticle *pPrevParticle, tParticleSystemData *pPSystemData)
 {
+	if ( pPSystemData->m_Type == PARTICLE_WATERDROP )
+		--numWaterDropOnScreen;
+	
 	if ( pPrevParticle )
 		pPrevParticle->m_pNext = pParticle->m_pNext;
 	else
@@ -1857,3 +2350,89 @@ void CParticle::AddYardieDoorSmoke(CVector const &vecPos, CMatrix const &matMatr
 					0.3f, color, 0, 0, 0, 0);
 	}
 }
+
+void CParticle::CalWindDir(CVector *vecDirIn, CVector *vecDirOut)
+{
+	vecDirOut->x = (Cos(128) * vecDirIn->x) + (Sin(128) * vecDirIn->y);
+
+	vecDirOut->x = (Cos(128) * vecDirIn->x) + (Sin(128) * vecDirIn->y) * CWeather::Wind;
+	vecDirOut->y = (Sin(128) * vecDirIn->x) - (Cos(128) * vecDirIn->y) * CWeather::Wind;
+}
+
+void CParticle::HandleShipsAtHorizonStuff()
+{
+	tParticleSystemData *psystemdata = &mod_ParticleSystemManager.m_aParticles[PARTICLE_SHIP_SIDE];
+
+	for ( CParticle *particle = psystemdata->m_pParticles; particle; particle = particle->m_pNext )
+	{
+		if ( CTimer::GetTimeInMilliseconds() > particle->m_nTimeWhenWillBeDestroyed - 32000 
+				&& CTimer::GetTimeInMilliseconds() < particle->m_nTimeWhenWillBeDestroyed - 22000 )
+		{		
+			particle->m_nAlpha = Min(particle->m_nAlpha + 1, 96);
+		}
+		if ( CTimer::GetTimeInMilliseconds() > particle->m_nTimeWhenWillBeDestroyed - 10000 )
+			particle->m_nFadeAlphaTimer = 1;
+	}
+}
+
+void CParticle::HandleShootableBirdsStuff(CEntity *entity, CVector const&camPos)
+{
+	float fHeadingRad = entity->GetForward().Heading();
+	float fHeading = RADTODEG(fHeadingRad);
+	float fBirdAngle = Cos(DEGTORAD(1.5f));
+	
+	tParticleSystemData *psystem = &mod_ParticleSystemManager.m_aParticles[PARTICLE_BIRD_FRONT];
+	CParticle *particle = psystem->m_pParticles;
+	CParticle *prevParticle = nil;
+	bool bRemoveParticle;
+			
+	for ( ; particle != nil; _Next(particle, prevParticle, psystem, bRemoveParticle) )
+	{
+		bRemoveParticle = false;
+		
+		CVector2D vecPos(particle->m_vecPosition.x, particle->m_vecPosition.y);
+		CVector2D vecCamPos(camPos.x, camPos.y);
+
+		CVector2D vecDist = vecPos - vecCamPos;
+		vecDist.Normalise();
+		
+		float fHead = DEGTORAD(fHeading);
+
+		CVector2D vecDir(-::Sin(fHead), ::Cos(fHead));
+		vecDir.Normalise();
+		
+		float fDot = DotProduct2D(vecDir, vecDist);
+		
+		if ( fDot > 0.0f && fDot > fBirdAngle )
+		{
+			if ( (camPos - particle->m_vecPosition).MagnitudeSqr() < 40000.0f )
+			{
+				CStats::SeagullsKilled++;
+				
+				bRemoveParticle = true;
+
+				for ( int32 i = 0; i < 8; i++ )
+				{	
+					CParticle *pBirdDerbis = AddParticle(PARTICLE_BIRD_DEBRIS,
+												particle->m_vecPosition,
+												CVector
+												(
+													CGeneral::GetRandomNumberInRange(-3.0f, 3.0f),
+													CGeneral::GetRandomNumberInRange(-3.0f, 3.0f),
+													CGeneral::GetRandomNumberInRange(-3.0f, 3.0f)
+												),
+												nil,
+												0.3f,
+												particle->m_Color,
+												CGeneral::GetRandomNumberInRange(20, 40),
+												0,
+												CGeneral::GetRandomNumber() & 3,
+												200);
+					if ( pBirdDerbis )
+						pBirdDerbis->m_nAlpha = particle->m_nAlpha;
+				}
+			}
+		}
+	}
+	
+}
\ No newline at end of file
diff --git a/src/render/Particle.h b/src/render/Particle.h
index 7f02e318..d254ef65 100644
--- a/src/render/Particle.h
+++ b/src/render/Particle.h
@@ -15,25 +15,24 @@ public:
 
 	CVector   m_vecPosition;
 	CVector   m_vecVelocity;
-	CVector   m_vecScreenPosition;
-	uint32     m_nTimeWhenWillBeDestroyed;
-	uint32     m_nTimeWhenColorWillBeChanged;
+	uint32    m_nTimeWhenWillBeDestroyed;
+	uint32    m_nTimeWhenColorWillBeChanged;
 	float     m_fZGround;
 	CVector   m_vecParticleMovementOffset;
 	int16     m_nCurrentZRotation;
-	uint16     m_nZRotationTimer;
+	uint16    m_nZRotationTimer;
 	float     m_fCurrentZRadius;
-	uint16     m_nZRadiusTimer;
-	float     m_fSize;
-	float     m_fExpansionRate;
-	uint16     m_nFadeToBlackTimer;
-	uint16     m_nFadeAlphaTimer;
+	uint16    m_nZRadiusTimer;
 	uint8     m_nColorIntensity;
 	uint8     m_nAlpha;
-	uint16    m_nCurrentFrame;
+	float     m_fSize;
+	float     m_fExpansionRate;
+	int16     m_nFadeToBlackTimer;
+	int16     m_nFadeAlphaTimer;
 	int16     m_nAnimationSpeedTimer;
 	int16     m_nRotationStep;
 	int16     m_nRotation;
+	uint8     m_nCurrentFrame;
 	RwRGBA    m_Color;
 	CParticle *m_pNext;
 	
@@ -60,8 +59,11 @@ public:
 	static void Initialise();
 	static void Shutdown();
 	
-	static CParticle *AddParticle(tParticleType type, CVector const &vecPos, CVector const &vecDir, CEntity *pEntity = nil, float fSize = 0.0f, int32 nRotationSpeed = 0, int32 nRotation = 0, int32 nCurFrame = 0, int32 nLifeSpan = 0);
-	static CParticle *AddParticle(tParticleType type, CVector const &vecPos, CVector const &vecDir, CEntity *pEntity, float fSize, RwRGBA const &color, int32 nRotationSpeed = 0, int32 nRotation = 0, int32 nCurFrame = 0, int32 nLifeSpan = 0);
+	static void AddParticlesAlongLine(tParticleType type, CVector const &vecStart, CVector const &vecEnd, CVector const &vecDir, float fPower, CEntity *pEntity = nil, float fSize = 0.0f,                     int32 nRotationSpeed = 0, int32 nRotation = 0, int32 nCurFrame = 0, int32 nLifeSpan = 0);	
+	static void AddParticlesAlongLine(tParticleType type, CVector const &vecStart, CVector const &vecEnd, CVector const &vecDir, float fPower, CEntity *pEntity,       float fSize, RwRGBA const&color,        int32 nRotationSpeed = 0, int32 nRotation = 0, int32 nCurFrame = 0, int32 nLifeSpan = 0);
+
+	static CParticle *AddParticle(tParticleType type, CVector const &vecPos, CVector const &vecDir, CEntity *pEntity = nil, float fSize = 0.0f,               int32 nRotationSpeed = 0, int32 nRotation = 0, int32 nCurFrame = 0, int32 nLifeSpan = 0);
+	static CParticle *AddParticle(tParticleType type, CVector const &vecPos, CVector const &vecDir, CEntity *pEntity,       float fSize, RwRGBA const &color, int32 nRotationSpeed = 0, int32 nRotation = 0, int32 nCurFrame = 0, int32 nLifeSpan = 0);
 
 	static void Update();
 	static void Render();
@@ -89,6 +91,10 @@ public:
 
 	static void AddJetExplosion(CVector const &vecPos, float fPower, float fSize);
 	static void AddYardieDoorSmoke(CVector const &vecPos, CMatrix const &matMatrix);
+	static void CalWindDir(CVector *vecDirIn, CVector *vecDirOut);
+	
+	static void HandleShipsAtHorizonStuff();
+	static void HandleShootableBirdsStuff(CEntity *entity, CVector const&camPos);
 };
 
-VALIDATE_SIZE(CParticle, 0x68);
+VALIDATE_SIZE(CParticle, 0x58);
diff --git a/src/render/ParticleMgr.cpp b/src/render/ParticleMgr.cpp
index 3387d471..f6919435 100644
--- a/src/render/ParticleMgr.cpp
+++ b/src/render/ParticleMgr.cpp
@@ -216,6 +216,18 @@ void cParticleSystemMgr::LoadParticleData()
 					case CFG_PARAM_TRAIL_LENGTH_MULTIPLIER:
 						entry->m_fTrailLengthMultiplier = atof(value);
 						break;
+						
+					case CFG_PARAM_STRETCH_VALUE_X:
+						entry->m_vecTextureStretch.x = atof(value);
+						break;
+
+					case CFG_PARAM_STRETCH_VALUE_Y:
+						entry->m_vecTextureStretch.y = atof(value);
+						break;
+
+					case CFG_PARAM_WIND_FACTOR:
+						entry->m_fWindFactor = atof(value);
+						break;
 
 					case CFG_PARAM_PARTICLE_CREATE_RANGE:
 						entry->m_fCreateRange = SQR(atof(value));
diff --git a/src/render/ParticleMgr.h b/src/render/ParticleMgr.h
index 0100bb65..f4afc018 100644
--- a/src/render/ParticleMgr.h
+++ b/src/render/ParticleMgr.h
@@ -36,14 +36,14 @@ struct tParticleSystemData
 	uint16        m_nZRadiusChangeTime;
 	float         m_fInitialZRadius;
 	float         m_fZRadiusChangeAmount;
-	uint16        m_nFadeToBlackTime;
-	int16         m_nFadeToBlackAmount;
+	int16         m_nFadeToBlackTime;
 	uint8         m_nFadeToBlackInitialIntensity;
+	int16         m_nFadeToBlackAmount;
 	uint8         m_nFadeAlphaInitialIntensity;
-	uint16        m_nFadeAlphaTime;
+	int16         m_nFadeAlphaTime;
 	int16         m_nFadeAlphaAmount;
-	uint16        m_nStartAnimationFrame;
-	uint16        m_nFinalAnimationFrame;
+	uint8         m_nStartAnimationFrame;
+	uint8         m_nFinalAnimationFrame;
 	uint16        m_nAnimationSpeed;
 	uint16        m_nRotationSpeed;
 	float         m_fGravitationalAcceleration;
@@ -56,16 +56,19 @@ struct tParticleSystemData
 	uint32        m_nLifeSpanErrorShape;
 	float         m_fTrailLengthMultiplier;
 	uint32        Flags;
-	RwRGBA        m_RenderColouring;
+	CRGBA         m_RenderColouring;
 	uint8         m_InitialColorVariation;
-	RwRGBA        m_FadeDestinationColor;
+	CRGBA         m_FadeDestinationColor;
 	uint32        m_ColorFadeTime;
+	
+	CVector2D     m_vecTextureStretch;
+	float         m_fWindFactor;
 
 	RwRaster      **m_ppRaster;
 	CParticle     *m_pParticles;
 };
 
-VALIDATE_SIZE(tParticleSystemData, 0x88);
+VALIDATE_SIZE(tParticleSystemData, 0x94);
 
 class cParticleSystemMgr
 {
@@ -107,6 +110,11 @@ class cParticleSystemMgr
 		CFG_PARAM_ROTATION_RATE_ERROR,
 		CFG_PARAM_LIFE_SPAN_ERROR_SHAPE,
 		CFG_PARAM_TRAIL_LENGTH_MULTIPLIER,
+		
+		CFG_PARAM_STRETCH_VALUE_X,
+		CFG_PARAM_STRETCH_VALUE_Y,
+		CFG_PARAM_WIND_FACTOR,
+		
 		CFG_PARAM_PARTICLE_CREATE_RANGE,
 		CFG_PARAM_FLAGS,
 
@@ -125,6 +133,6 @@ public:
 	void RangeCheck(tParticleSystemData *pData) { }
 };
 
-VALIDATE_SIZE(cParticleSystemMgr, 0x2420);
+VALIDATE_SIZE(cParticleSystemMgr, 0x2FFC);
 
 extern cParticleSystemMgr mod_ParticleSystemManager;
diff --git a/src/render/ParticleType.h b/src/render/ParticleType.h
index 8d352c44..0af9a1e1 100644
--- a/src/render/ParticleType.h
+++ b/src/render/ParticleType.h
@@ -4,13 +4,16 @@ enum tParticleType
 {
 	PARTICLE_SPARK = 0,
 	PARTICLE_SPARK_SMALL,
+	PARTICLE_WATER_SPARK,
 	PARTICLE_WHEEL_DIRT,
+	PARTICLE_SAND,
 	PARTICLE_WHEEL_WATER,
 	PARTICLE_BLOOD,
 	PARTICLE_BLOOD_SMALL,
 	PARTICLE_BLOOD_SPURT,
 	PARTICLE_DEBRIS,
 	PARTICLE_DEBRIS2,
+	PARTICLE_FLYERS,
 	PARTICLE_WATER,
 	PARTICLE_FLAME,
 	PARTICLE_FIREBALL,
@@ -18,8 +21,11 @@ enum tParticleType
 	PARTICLE_GUNFLASH_NOANIM,
 	PARTICLE_GUNSMOKE,
 	PARTICLE_GUNSMOKE2,
+	PARTICLE_CIGARETTE_SMOKE,
 	PARTICLE_SMOKE,
 	PARTICLE_SMOKE_SLOWMOTION,
+	PARTICLE_DRY_ICE,
+	PARTICLE_TEARGAS,
 	PARTICLE_GARAGEPAINT_SPRAY,
 	PARTICLE_SHARD,
 	PARTICLE_SPLASH,
@@ -28,6 +34,7 @@ enum tParticleType
 	PARTICLE_STEAM2,
 	PARTICLE_STEAM_NY,
 	PARTICLE_STEAM_NY_SLOWMOTION,
+	PARTICLE_GROUND_STEAM,
 	PARTICLE_ENGINE_STEAM,
 	PARTICLE_RAINDROP,
 	PARTICLE_RAINDROP_SMALL,
@@ -35,6 +42,8 @@ enum tParticleType
 	PARTICLE_RAIN_SPLASH_BIGGROW,
 	PARTICLE_RAIN_SPLASHUP,
 	PARTICLE_WATERSPRAY,
+	PARTICLE_WATERDROP,
+	PARTICLE_BLOODDROP,
 	PARTICLE_EXPLOSION_MEDIUM,
 	PARTICLE_EXPLOSION_LARGE,
 	PARTICLE_EXPLOSION_MFAST,
@@ -42,12 +51,12 @@ enum tParticleType
 	PARTICLE_CAR_SPLASH,
 	PARTICLE_BOAT_SPLASH,
 	PARTICLE_BOAT_THRUSTJET,
-	PARTICLE_BOAT_WAKE,
 	PARTICLE_WATER_HYDRANT,
 	PARTICLE_WATER_CANNON,
 	PARTICLE_EXTINGUISH_STEAM,
 	PARTICLE_PED_SPLASH,
 	PARTICLE_PEDFOOT_DUST,
+	PARTICLE_CAR_DUST,
 	PARTICLE_HELI_DUST,
 	PARTICLE_HELI_ATTACK,
 	PARTICLE_ENGINE_SMOKE,
@@ -58,6 +67,7 @@ enum tParticleType
 	PARTICLE_TREE_LEAVES,
 	PARTICLE_CARCOLLISION_DUST,
 	PARTICLE_CAR_DEBRIS,
+	PARTICLE_BIRD_DEBRIS,
 	PARTICLE_HELI_DEBRIS,
 	PARTICLE_EXHAUST_FUMES,
 	PARTICLE_RUBBER_SMOKE,
@@ -67,9 +77,14 @@ enum tParticleType
 	PARTICLE_GUNSHELL,
 	PARTICLE_GUNSHELL_BUMP1,
 	PARTICLE_GUNSHELL_BUMP2,
+	PARTICLE_ROCKET_SMOKE,
 	PARTICLE_TEST,
 	PARTICLE_BIRD_FRONT,
+	PARTICLE_SHIP_SIDE,
+	PARTICLE_BEASTIE,
 	PARTICLE_RAINDROP_2D,
+	PARTICLE_HEATHAZE,
+	PARTICLE_HEATHAZE_IN_DIST,
 	
 	MAX_PARTICLES,
 	PARTICLE_FIRST = PARTICLE_SPARK,
diff --git a/src/render/Sprite.h b/src/render/Sprite.h
index ec4c1d1b..fae6684e 100644
--- a/src/render/Sprite.h
+++ b/src/render/Sprite.h
@@ -7,6 +7,9 @@ class CSprite
 	static float m_fRecipNearClipPlane;
 	static int32 m_bFlushSpriteBufferSwitchZTest;
 public:
+	static float GetNearScreenZ(void) { return m_f2DNearScreenZ; }
+	static float GetFarScreenZ(void) { return m_f2DFarScreenZ; }
+
 	static float CalcHorizonCoors(void);
 	static bool CalcScreenCoors(const RwV3d &in, RwV3d *out, float *outw, float *outh, bool farclip);
 	static void InitSpriteBuffer(void);
diff --git a/src/render/Weather.cpp b/src/render/Weather.cpp
index 324c63ea..106e2f89 100644
--- a/src/render/Weather.cpp
+++ b/src/render/Weather.cpp
@@ -567,7 +567,7 @@ void CWeather::RenderRainStreaks(void)
 		RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDONE);
 		RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDONE);
 		RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
-		RwRenderStateSet(rwRENDERSTATETEXTURERASTER, RwTextureGetRaster(gpRainDropTex[3]));
+		RwRenderStateSet(rwRENDERSTATETEXTURERASTER, RwTextureGetRaster(gpRainDropTex));
 		if (RwIm3DTransform(TempBufferRenderVertices, TempBufferVerticesStored, nil, 1))
 		{
 			RwIm3DRenderIndexedPrimitive(rwPRIMTYPETRILIST, TempBufferRenderIndexList, TempBufferIndicesStored);
diff --git a/src/render/Weather.h b/src/render/Weather.h
index bd9b9603..ae09e5d1 100644
--- a/src/render/Weather.h
+++ b/src/render/Weather.h
@@ -63,4 +63,4 @@ struct tRainStreak
 	uint32 timer;
 };
 
-extern RwTexture* gpRainDropTex[4];
\ No newline at end of file
+extern RwTexture* gpRainDropTex;
\ No newline at end of file