File tree Expand file tree Collapse file tree 2 files changed +8
-6
lines changed
GeneralsMD/Code/GameEngine Expand file tree Collapse file tree 2 files changed +8
-6
lines changed Original file line number Diff line number Diff line change @@ -725,9 +725,9 @@ class Drawable : public Thing,
725725 UnsignedInt m_expirationDate; // /< if nonzero, Drawable should destroy itself at this frame
726726 DrawableIconInfo* m_iconInfo; // /< lazily allocated!
727727
728- static inline Real m_secondMaterialPassOpacityScalar ; // /< multiply opacity by scalar value; used for non-default render framerates
729- Real m_secondMaterialPassOpacity; // /< drawable gets rendered again in hardware with an extra material layer
730- Bool m_secondMaterialPassOpacityAllowRefill; // /< allow the second material opacity to be set to 1.0f
728+ static Real s_secondMaterialPassOpacityScalar ; // /< multiply opacity by scalar value; used for non-default render framerates
729+ Real m_secondMaterialPassOpacity; // /< drawable gets rendered again in hardware with an extra material layer
730+ Bool m_secondMaterialPassOpacityAllowRefill; // /< allow the second material opacity to be set to 1.0f
731731 // --------- BYTE-SIZED THINGS GO HERE
732732 Byte m_selected; // /< drawable is selected or not
733733 Bool m_hidden; // /< drawable is "hidden" or not (overrides stealth effects)
Original file line number Diff line number Diff line change @@ -256,6 +256,8 @@ const Int MAX_ENABLED_MODULES = 16;
256256// ------------------------------------------------------------------------------------------------
257257// ------------------------------------------------------------------------------------------------
258258
259+ /* static*/ Real Drawable::s_secondMaterialPassOpacityScalar = 1 .0f ;
260+
259261/* static*/ Bool Drawable::s_staticImagesInited = false ;
260262/* static*/ const Image* Drawable::s_veterancyImage[LEVEL_COUNT] = { NULL };
261263/* static*/ const Image* Drawable::s_fullAmmo = NULL ;
@@ -2608,7 +2610,7 @@ void Drawable::updateSecondMaterialPassOpacityScalar()
26082610 const Real updatesPerSec = 2 .0f ;
26092611 const Real scalar = pow (MATERIAL_PASS_OPACITY_MIN, updatesPerSec / TheFramePacer->getUpdateFps ());
26102612
2611- m_secondMaterialPassOpacityScalar = scalar;
2613+ s_secondMaterialPassOpacityScalar = scalar;
26122614}
26132615
26142616// -------------------------------------------------------------------------------------------------
@@ -2631,12 +2633,12 @@ void Drawable::draw()
26312633 {
26322634 if (!shouldFade && allowRefill)
26332635 {
2634- m_secondMaterialPassOpacity = m_secondMaterialPassOpacityScalar ;
2636+ m_secondMaterialPassOpacity = s_secondMaterialPassOpacityScalar ;
26352637 m_secondMaterialPassOpacityAllowRefill = FALSE ;
26362638 }
26372639 else
26382640 {
2639- m_secondMaterialPassOpacity *= m_secondMaterialPassOpacityScalar ;
2641+ m_secondMaterialPassOpacity *= s_secondMaterialPassOpacityScalar ;
26402642 }
26412643 }
26422644 else
You can’t perform that action at this time.
0 commit comments