From bd7df76059239151f259058f8e1e41fe5dd43e58 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 22 Mar 2016 12:56:20 +0100 Subject: [PATCH] - fixed compilation of AActor::alpha --- src/gl/scene/gl_sprite.cpp | 4 ++-- src/gl/scene/gl_weapon.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gl/scene/gl_sprite.cpp b/src/gl/scene/gl_sprite.cpp index 35ac2dc2e8..ccc069f897 100644 --- a/src/gl/scene/gl_sprite.cpp +++ b/src/gl/scene/gl_sprite.cpp @@ -498,7 +498,7 @@ void GLSprite::Process(AActor* thing,sector_t * sector) P_CheckPlayerSprite(thing, spritenum, sprscale); } - if (thing->renderflags & RF_INVISIBLE || !thing->RenderStyle.IsVisible(thing->alpha)) + if (thing->renderflags & RF_INVISIBLE || !thing->RenderStyle.IsVisible(thing->Alpha)) { if (!(thing->flags & MF_STEALTH) || !gl_fixedcolormap || !gl_enhanced_nightvision) return; @@ -713,7 +713,7 @@ void GLSprite::Process(AActor* thing,sector_t * sector) translation=thing->Translation; OverrideShader = -1; - trans = FIXED2FLOAT(thing->alpha); + trans = thing->Alpha; hw_styleflags = STYLEHW_Normal; if (RenderStyle.BlendOp >= STYLEOP_Fuzz && RenderStyle.BlendOp <= STYLEOP_FuzzOrRevSub) diff --git a/src/gl/scene/gl_weapon.cpp b/src/gl/scene/gl_weapon.cpp index 102c30ff56..c8a9889eb7 100644 --- a/src/gl/scene/gl_weapon.cpp +++ b/src/gl/scene/gl_weapon.cpp @@ -300,7 +300,7 @@ void FGLRenderer::DrawPlayerSprites(sector_t * viewsector, bool hudModelStep) visstyle_t vis; vis.RenderStyle=playermo->RenderStyle; - vis.alpha=playermo->alpha; + vis.alpha=playermo->Alpha; vis.colormap = NULL; if (playermo->Inventory) {