diff options
| author | Steven Fuller <relnev@icculus.org> | 2001-08-12 02:30:17 +0000 |
|---|---|---|
| committer | Patryk Obara <dreamer.tan@gmail.com> | 2019-08-20 02:22:36 +0200 |
| commit | de3fda828dae5015dcadb7018188f80a4f265dcb (patch) | |
| tree | 4474b8f156c5796d247efb80bcabb70194002f6e /src/opengl.c | |
| parent | ae2906ca8302cd41f05582232799b35e0b05414d (diff) | |
Fixed particle colors for real this time.
Worked around a crash (DIV_FIXED by zero) that happens when the Alien level
FERARCO starts.
Diffstat (limited to 'src/opengl.c')
| -rw-r--r-- | src/opengl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/opengl.c b/src/opengl.c index 21bda70..75f3a7e 100644 --- a/src/opengl.c +++ b/src/opengl.c @@ -333,6 +333,7 @@ void D3D_Particle_Output(PARTICLE *particlePtr, RENDERVERTEX *renderVerticesPtr) { int r, g, b, a; + /* this should be OK. (ColourComponents was RGBA while RGBA_MAKE is BGRA (little endian) */ r = (particlePtr->Colour >> 0) & 0xFF; g = (particlePtr->Colour >> 8) & 0xFF; b = (particlePtr->Colour >> 16) & 0xFF; @@ -355,9 +356,9 @@ void D3D_Particle_Output(PARTICLE *particlePtr, RENDERVERTEX *renderVerticesPtr) } else { int r, g, b, a; - r = (particlePtr->Colour >> 0) & 0xFF; + b = (particlePtr->Colour >> 0) & 0xFF; g = (particlePtr->Colour >> 8) & 0xFF; - b = (particlePtr->Colour >> 16) & 0xFF; + r = (particlePtr->Colour >> 16) & 0xFF; a = (particlePtr->Colour >> 24) & 0xFF; glColor4ub(r, g, b, a); |