summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/modelinfo/VehicleModelInfo.cpp4
-rw-r--r--src/render/Particle.cpp45
2 files changed, 29 insertions, 20 deletions
diff --git a/src/modelinfo/VehicleModelInfo.cpp b/src/modelinfo/VehicleModelInfo.cpp
index c8a19df1..4caacc7f 100644
--- a/src/modelinfo/VehicleModelInfo.cpp
+++ b/src/modelinfo/VehicleModelInfo.cpp
@@ -1108,6 +1108,7 @@ CVehicleModelInfo::SetEnvironmentMapCB(RpAtomic *atomic, void *data)
void
CVehicleModelInfo::SetEnvironmentMap(void)
{
+/*
CSimpleModelInfo *wheelmi;
int32 i;
@@ -1125,6 +1126,7 @@ CVehicleModelInfo::SetEnvironmentMap(void)
for(i = 0; i < wheelmi->m_numAtomics; i++)
SetEnvironmentMapCB(wheelmi->m_atomics[i], nil);
}
+*/
#ifdef EXTENDED_PIPELINES
CustomPipes::AttachVehiclePipe(m_clump);
@@ -1150,10 +1152,12 @@ CVehicleModelInfo::LoadEnvironmentMaps(void)
void
CVehicleModelInfo::ShutdownEnvironmentMaps(void)
{
+/*
RwTextureDestroy(gpWhiteTexture);
gpWhiteTexture = nil;
RwFrameDestroy(pMatFxIdentityFrame);
pMatFxIdentityFrame = nil;
+*/
}
int
diff --git a/src/render/Particle.cpp b/src/render/Particle.cpp
index ff74bc67..d6ee36a1 100644
--- a/src/render/Particle.cpp
+++ b/src/render/Particle.cpp
@@ -531,7 +531,7 @@ void CParticle::Initialise()
break;
case PARTICLE_WHEEL_DIRT:
- entry->m_ppRaster = &gpRubberRaster[4];
+ entry->m_ppRaster = &gpSmoke2Raster;
break;
case PARTICLE_SAND:
@@ -597,16 +597,16 @@ void CParticle::Initialise()
case PARTICLE_CIGARETTE_SMOKE:
entry->m_ppRaster = &gpGunSmokeRaster;
break;
-
+
+ case PARTICLE_TEARGAS:
+ entry->m_ppRaster = &gpHeatHazeRaster;
+ break;
+
case PARTICLE_SMOKE:
case PARTICLE_SMOKE_SLOWMOTION:
case PARTICLE_DRY_ICE:
entry->m_ppRaster = gpSmokeRaster;
break;
-
- case PARTICLE_TEARGAS:
- entry->m_ppRaster = &gpHeatHazeRaster;
- break;
case PARTICLE_GARAGEPAINT_SPRAY:
entry->m_ppRaster = gpSmokeRaster;
@@ -663,6 +663,10 @@ void CParticle::Initialise()
case PARTICLE_WATERSPRAY:
entry->m_ppRaster = gpWatersprayRaster;
break;
+
+ case PARTICLE_RAINDROP_2D:
+ entry->m_ppRaster = &gpRainDropRaster;
+ break;
case PARTICLE_EXPLOSION_MEDIUM:
entry->m_ppRaster = gpExplosionMediumRaster;
@@ -725,7 +729,7 @@ void CParticle::Initialise()
break;
case PARTICLE_ENGINE_SMOKE:
- entry->m_ppRaster = &gpSmokeRaster[4];
+ entry->m_ppRaster = &gpCloudRaster4;
break;
case PARTICLE_ENGINE_SMOKE2:
@@ -734,7 +738,7 @@ void CParticle::Initialise()
break;
case PARTICLE_CARFLAME_SMOKE:
- entry->m_ppRaster= &gpCloudRaster4;
+ entry->m_ppRaster = &gpCloudRaster4;
break;
case PARTICLE_FIREBALL_SMOKE:
@@ -780,7 +784,7 @@ void CParticle::Initialise()
break;
case PARTICLE_GUNSHELL:
- entry->m_ppRaster= &gpGunShellRaster;
+ entry->m_ppRaster = &gpGunShellRaster;
break;
case PARTICLE_GUNSHELL_BUMP1:
@@ -792,7 +796,7 @@ void CParticle::Initialise()
break;
case PARTICLE_TEST:
- entry->m_ppRaster = &gpSmokeRaster[4];
+ entry->m_ppRaster = &gpCloudRaster4;
break;
case PARTICLE_BIRD_FRONT:
@@ -800,23 +804,19 @@ void CParticle::Initialise()
break;
case PARTICLE_SHIP_SIDE:
- entry->m_ppRaster= gpBoatRaster;
+ entry->m_ppRaster = gpBoatRaster;
break;
case PARTICLE_BEASTIE:
entry->m_ppRaster = &gpBeastieRaster;
break;
- case PARTICLE_RAINDROP_2D:
- entry->m_ppRaster= &gpRainDropRaster;
- break;
-
case PARTICLE_FERRY_CHIM_SMOKE:
- entry->m_ppRaster= gpSmokeRaster;
+ entry->m_ppRaster = gpSmokeRaster;
break;
case PARTICLE_MULTIPLAYER_HIT:
- entry->m_ppRaster= &gpMultiPlayerHitRaster;
+ entry->m_ppRaster = &gpMultiPlayerHitRaster;
break;
}
}
@@ -904,9 +904,14 @@ void CParticle::Shutdown()
{
RwTextureDestroy(gpRainDripTex[i]);
gpRainDripTex[i] = nil;
-
- RwTextureDestroy(gpRainDripDarkTex[i]); // hmm, i think gpRainDripDarkTex[1(one)] can crash, let's wait for report hehe
- gpRainDripDarkTex[i] = nil;
+
+#ifdef FIX_BUGS
+ if (gpRainDripDarkTex[i])
+#endif
+ {
+ RwTextureDestroy(gpRainDripDarkTex[i]);
+ gpRainDripDarkTex[i] = nil;
+ }
}
RwTextureDestroy(gpBoatWakeTex);