zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-12-01 16:41:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: The implementation for Doom64 colors did not handle particles.

Browse source
This commit is contained in:
Christoph Oelckers 2017-01-29 18:57:47 +01:00
parent 729eade8f5
commit b93c3619e9
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gl/scene/gl_sprite.cpp
View file

@ -326,12 +326,16 @@ void GLSprite::Draw(int pass)
{ {
gl_SetDynSpriteLight(gl_light_sprites ? actor : NULL, gl_light_particles ? particle : NULL); gl_SetDynSpriteLight(gl_light_sprites ? actor : NULL, gl_light_particles ? particle : NULL);
} }
PalEntry finalcol(ThingColor.a, sector_t *cursec = actor ? actor->Sector : particle ? particle->subsector->sector : nullptr;
ThingColor.r * actor->Sector->SpecialColors[sector_t::sprites].r / 255, if (cursec != nullptr)
ThingColor.g * actor->Sector->SpecialColors[sector_t::sprites].g / 255, {
ThingColor.b * actor->Sector->SpecialColors[sector_t::sprites].b / 255); PalEntry finalcol(ThingColor.a,
ThingColor.r * cursec->SpecialColors[sector_t::sprites].r / 255,
ThingColor.g * cursec->SpecialColors[sector_t::sprites].g / 255,
ThingColor.b * cursec->SpecialColors[sector_t::sprites].b / 255);
gl_RenderState.SetObjectColor(finalcol); gl_RenderState.SetObjectColor(finalcol);
}
gl_SetColor(lightlevel, rel, Colormap, trans); gl_SetColor(lightlevel, rel, Colormap, trans);
} }