summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFire-Head <Fire-Head@users.noreply.github.com>2021-01-17 04:16:49 +0100
committerFire-Head <Fire-Head@users.noreply.github.com>2021-01-17 04:16:49 +0100
commit777ef6b663871659f4f1bbedf9e5819e830fa1c4 (patch)
tree5414a15bda7214518a259f29e07bcfac6472d109 /src
parentfix crash on exit (diff)
downloadre3-777ef6b663871659f4f1bbedf9e5819e830fa1c4.tar
re3-777ef6b663871659f4f1bbedf9e5819e830fa1c4.tar.gz
re3-777ef6b663871659f4f1bbedf9e5819e830fa1c4.tar.bz2
re3-777ef6b663871659f4f1bbedf9e5819e830fa1c4.tar.lz
re3-777ef6b663871659f4f1bbedf9e5819e830fa1c4.tar.xz
re3-777ef6b663871659f4f1bbedf9e5819e830fa1c4.tar.zst
re3-777ef6b663871659f4f1bbedf9e5819e830fa1c4.zip
Diffstat (limited to 'src')
-rw-r--r--src/render/Particle.cpp34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/render/Particle.cpp b/src/render/Particle.cpp
index a27a261a..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;
}
}