2 files changed, 50 insertions, 10 deletions

diff --git a/src/render/Particle.cpp b/src/render/Particle.cpp
index 35812024..ff74bc67 100644
--- a/src/render/Particle.cpp
+++ b/src/render/Particle.cpp
@@ -321,84 +321,101 @@ void CParticle::Initialise()
 	for ( int32 i = 0; i < MAX_SMOKE_FILES; i++ )
 	{
 		gpSmokeTex[i] = RwTextureRead(SmokeFiles[i], nil);
+		ASSERT(gpSmokeTex[i] != nil);
 		gpSmokeRaster[i] = RwTextureGetRaster(gpSmokeTex[i]);
 	}
 	
 	gpSmoke2Tex = RwTextureRead("smokeII_3", nil);
+	ASSERT(gpSmoke2Tex != nil);
 	gpSmoke2Raster = RwTextureGetRaster(gpSmoke2Tex);
 	
 	for ( int32 i = 0; i < MAX_RUBBER_FILES; i++ )
 	{
 		gpRubberTex[i] = RwTextureRead(RubberFiles[i], nil);
+		ASSERT(gpRubberTex[i] != nil);
 		gpRubberRaster[i] = RwTextureGetRaster(gpRubberTex[i]);
 	}
 	
 	for ( int32 i = 0; i < MAX_RAINSPLASH_FILES; i++ )
 	{
 		gpRainSplashTex[i] = RwTextureRead(RainSplashFiles[i], nil);
+		ASSERT(gpRainSplashTex[i] != nil);
 		gpRainSplashRaster[i] = RwTextureGetRaster(gpRainSplashTex[i]);
 	}
 	
 	for ( int32 i = 0; i < MAX_WATERSPRAY_FILES; i++ )
 	{
 		gpWatersprayTex[i] = RwTextureRead(WatersprayFiles[i], nil);
+		ASSERT(gpWatersprayTex[i] != nil);
 		gpWatersprayRaster[i] = RwTextureGetRaster(gpWatersprayTex[i]);
 	}
 	
 	for ( int32 i = 0; i < MAX_EXPLOSIONMEDIUM_FILES; i++ )
 	{
 		gpExplosionMediumTex[i] = RwTextureRead(ExplosionMediumFiles[i], nil);
+		ASSERT(gpExplosionMediumTex[i] != nil);
 		gpExplosionMediumRaster[i] = RwTextureGetRaster(gpExplosionMediumTex[i]);
 	}
 	
 	for ( int32 i = 0; i < MAX_GUNFLASH_FILES; i++ )
 	{
 		gpGunFlashTex[i] = RwTextureRead(GunFlashFiles[i], nil);
+		ASSERT(gpGunFlashTex[i] != nil);
 		gpGunFlashRaster[i] = RwTextureGetRaster(gpGunFlashTex[i]);
 	}
 	
 	gpRainDropTex = RwTextureRead("raindrop4", nil);
+	ASSERT(gpRainDropTex != nil);
 	gpRainDropRaster = RwTextureGetRaster(gpRainDropTex);
 	
 	for ( int32 i = 0; i < MAX_RAINSPLASHUP_FILES; i++ )
 	{
 		gpRainSplashupTex[i] = RwTextureRead(RainSplashupFiles[i], nil);
+		ASSERT(gpRainSplashupTex[i] != nil);
 		gpRainSplashupRaster[i] = RwTextureGetRaster(gpRainSplashupTex[i]);
 	}
 	
 	for ( int32 i = 0; i < MAX_BIRDFRONT_FILES; i++ )
 	{
 		gpBirdfrontTex[i] = RwTextureRead(BirdfrontFiles[i], nil);
+		ASSERT(gpBirdfrontTex[i] != nil);
 		gpBirdfrontRaster[i] = RwTextureGetRaster(gpBirdfrontTex[i]);
 	}
 	
 	for ( int32 i = 0; i < MAX_BOAT_FILES; i++ )
 	{
 		gpBoatTex[i] = RwTextureRead(BoatFiles[i], nil);
+		ASSERT(gpBoatTex[i] != nil);
 		gpBoatRaster[i] = RwTextureGetRaster(gpBoatTex[i]);
 	}
 	
 	for ( int32 i = 0; i < MAX_CARDEBRIS_FILES; i++ )
 	{
 		gpCarDebrisTex[i] = RwTextureRead(CardebrisFiles[i], nil);
+		ASSERT(gpCarDebrisTex[i] != nil);
 		gpCarDebrisRaster[i] = RwTextureGetRaster(gpCarDebrisTex[i]);
 	}
 	
 	for ( int32 i = 0; i < MAX_CARSPLASH_FILES; i++ )
 	{
 		gpCarSplashTex[i] = RwTextureRead(CarsplashFiles[i], nil);
+		ASSERT(gpCarSplashTex[i] != nil);
 		gpCarSplashRaster[i] = RwTextureGetRaster(gpCarSplashTex[i]);
 	}
 
 	gpBoatWakeTex = RwTextureRead("boatwake2", nil);
+	ASSERT(gpBoatWakeTex != nil);
 	gpBoatWakeRaster = RwTextureGetRaster(gpBoatWakeTex);
 	
 	gpFlame1Tex = RwTextureRead("flame1", nil);
+	ASSERT(gpFlame1Tex != nil);
 	gpFlame1Raster = RwTextureGetRaster(gpFlame1Tex);
 
 	gpFlame5Tex = RwTextureRead("flame5", nil);
+	ASSERT(gpFlame5Tex != nil);
 	
-#ifdef FIX_BUGS
+//#ifdef FIX_BUGS
+#if 0
 	gpFlame5Raster = RwTextureGetRaster(gpFlame5Tex);
 #else
 	// this seems to have become more of a design choice
@@ -406,68 +423,91 @@ void CParticle::Initialise()
 #endif
 
 	gpRainDropSmallTex = RwTextureRead("rainsmall", nil);
+	ASSERT(gpRainDropSmallTex != nil);
 	gpRainDropSmallRaster = RwTextureGetRaster(gpRainDropSmallTex);
 
 	gpBloodTex = RwTextureRead("blood", nil);
+	ASSERT(gpBloodTex != nil);
 	gpBloodRaster = RwTextureGetRaster(gpBloodTex);
 
 	gpLeafTex = RwTextureRead("gameleaf01_64", nil);
+	ASSERT(gpLeafTex != nil);
 	gpLeafRaster = RwTextureGetRaster(gpLeafTex);
 	
 	gpLetterTex = RwTextureRead("letter", nil);
+	ASSERT(gpLetterTex != nil);
 	gpLetterRaster = RwTextureGetRaster(gpLetterTex);
 
 	gpCloudTex1 = RwTextureRead("cloud3", nil);
+	ASSERT(gpCloudTex1 != nil);
 	gpCloudRaster1 = RwTextureGetRaster(gpCloudTex1);
 
 	gpCloudTex4 = RwTextureRead("cloudmasked", nil);
+	ASSERT(gpCloudTex4 != nil);
 	gpCloudRaster4 = RwTextureGetRaster(gpCloudTex4);
 
 	gpBloodSmallTex = RwTextureRead("bloodsplat2", nil);
+	ASSERT(gpBloodSmallTex != nil);
 	gpBloodSmallRaster = RwTextureGetRaster(gpBloodSmallTex);
 
 	gpGungeTex = RwTextureRead("gunge", nil);
+	ASSERT(gpGungeTex != nil);
 	gpGungeRaster = RwTextureGetRaster(gpGungeTex);
 
 	gpCollisionSmokeTex = RwTextureRead("collisionsmoke", nil);
+	ASSERT(gpCollisionSmokeTex != nil);
 	gpCollisionSmokeRaster = RwTextureGetRaster(gpCollisionSmokeTex);
 
 	gpBulletHitTex = RwTextureRead("bullethitsmoke", nil);
+	ASSERT(gpBulletHitTex != nil);
 	gpBulletHitRaster = RwTextureGetRaster(gpBulletHitTex);
 
 	gpGunShellTex = RwTextureRead("gunshell", nil);
+	ASSERT(gpGunShellTex != nil);
 	gpGunShellRaster = RwTextureGetRaster(gpGunShellTex);
 
 	gpPointlightTex = RwTextureRead("smoke5", nil);
+	ASSERT(gpPointlightTex != nil);
 	gpPointlightRaster = RwTextureGetRaster(gpPointlightTex);
 	
 	gpSparkTex = RwTextureRead("spark", nil);
+	ASSERT(gpSparkTex != nil);
 	gpSparkRaster = RwTextureGetRaster(gpSparkTex);
 	
 	gpNewspaperTex = RwTextureRead("ballot_paper", nil);
+	ASSERT(gpNewspaperTex != nil);
 	gpNewspaperRaster = RwTextureGetRaster(gpNewspaperTex);
 	
 	gpGunSmokeTex = RwTextureRead("gunsmoke3", nil);
+	ASSERT(gpGunSmokeTex != nil);
 	gpGunSmokeRaster = RwTextureGetRaster(gpGunSmokeTex);
 	
 	gpHeatHazeTex = RwTextureRead("heathaze", nil);
+	ASSERT(gpHeatHazeTex != nil);
 	gpHeatHazeRaster = RwTextureGetRaster(gpHeatHazeTex);
 	
 	gpBeastieTex = RwTextureRead("beastie", nil);
+	ASSERT(gpBeastieTex != nil);
 	gpBeastieRaster = RwTextureGetRaster(gpBeastieTex);
 	
 	gpRainDripTex[0] = RwTextureRead("raindrip64", nil);
+	ASSERT(gpRainDripTex[0] != nil);
 	gpRainDripRaster[0] = RwTextureGetRaster(gpRainDripTex[0]);
 	
 	gpRainDripTex[1] = RwTextureRead("raindripb64", nil);
+	ASSERT(gpRainDripTex[1] != nil);
 	gpRainDripRaster[1] = RwTextureGetRaster(gpRainDripTex[1]);
 	
 	gpRainDripDarkTex[0] = RwTextureRead("raindrip64_d", nil);
+	ASSERT(gpRainDripDarkTex[0] != nil);
 	gpRainDripDarkRaster[0] = RwTextureGetRaster(gpRainDripDarkTex[0]);
 	
 	gpMultiPlayerHitTex = RwTextureRead("mphit", nil);
+	ASSERT(gpMultiPlayerHitTex != nil);
 	gpMultiPlayerHitRaster = RwTextureGetRaster(gpMultiPlayerHitTex);
+	
 	gpFireHoseTex = RwTextureRead("firehose", nil);
+	ASSERT(gpFireHoseTex != nil);
 	gpFireHoseRaster = RwTextureGetRaster(gpFireHoseTex);
 	
 	CTxdStore::PopCurrentTxd();
diff --git a/src/render/Shadows.cpp b/src/render/Shadows.cpp
index 2b1df555..ba902bae 100644
--- a/src/render/Shadows.cpp
+++ b/src/render/Shadows.cpp
@@ -76,14 +76,14 @@ CShadows::Init(void)
 	gpShadowBikeTex       = RwTextureRead("shad_bike",    nil);
 	gpShadowBaronTex      = RwTextureRead("shad_rcbaron", nil);
 	gpShadowExplosionTex  = RwTextureRead("shad_exp",     nil);
-	gpShadowHeadLightsTex = RwTextureRead("headlight",    nil);
+	gpShadowHeadLightsTex = RwTextureRead("headlight_single",    nil);
 	gpOutline1Tex         = RwTextureRead("outline_64",   nil);
 	gpOutline2Tex         = RwTextureRead("outline2_64",  nil);
 	gpOutline3Tex         = RwTextureRead("outline3_64",  nil);
 	gpBloodPoolTex        = RwTextureRead("bloodpool_64", nil);
-	gpReflectionTex       = RwTextureRead("reflection01", nil);
+	//gpReflectionTex       = RwTextureRead("reflection01", nil);
 	gpWalkDontTex         = RwTextureRead("walk_dont",    nil);
-	gpCrackedGlassTex     = RwTextureRead("wincrack_32",  nil);
+	//gpCrackedGlassTex     = RwTextureRead("wincrack_32",  nil);
 	gpPostShadowTex       = RwTextureRead("lamp_shad_64", nil);
 
 	CTxdStore::PopCurrentTxd();
@@ -99,9 +99,9 @@ CShadows::Init(void)
 	ASSERT(gpOutline2Tex != nil);
 	ASSERT(gpOutline3Tex != nil);
 	ASSERT(gpBloodPoolTex != nil);
-	ASSERT(gpReflectionTex != nil);
+	//ASSERT(gpReflectionTex != nil);
 	ASSERT(gpWalkDontTex != nil);
-	ASSERT(gpCrackedGlassTex != nil);
+	//ASSERT(gpCrackedGlassTex != nil);
 	ASSERT(gpPostShadowTex != nil);
 
 
@@ -178,9 +178,9 @@ CShadows::Shutdown(void)
 	ASSERT(gpOutline2Tex != nil);
 	ASSERT(gpOutline3Tex != nil);
 	ASSERT(gpBloodPoolTex != nil);
-	ASSERT(gpReflectionTex != nil);
+	//ASSERT(gpReflectionTex != nil);
 	ASSERT(gpWalkDontTex != nil);
-	ASSERT(gpCrackedGlassTex != nil);
+	//ASSERT(gpCrackedGlassTex != nil);
 	ASSERT(gpPostShadowTex != nil);
 
 	RwTextureDestroy(gpShadowCarTex);
@@ -194,9 +194,9 @@ CShadows::Shutdown(void)
 	RwTextureDestroy(gpOutline2Tex);
 	RwTextureDestroy(gpOutline3Tex);
 	RwTextureDestroy(gpBloodPoolTex);
-	RwTextureDestroy(gpReflectionTex);
+	//RwTextureDestroy(gpReflectionTex);
 	RwTextureDestroy(gpWalkDontTex);
-	RwTextureDestroy(gpCrackedGlassTex);
+	//RwTextureDestroy(gpCrackedGlassTex);
 	RwTextureDestroy(gpPostShadowTex);
 }