diff options
| author | Fire_Head <Fire-Head@users.noreply.github.com> | 2019-07-24 20:59:16 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-24 20:59:16 +0300 |
| commit | b79f77634dbb33627c390243d7cf2e7611d35d0a (patch) | |
| tree | d836f70678f2ce7b5d86a6745f34b45232ff71d0 /src/entities | |
| parent | ae69aaf5ce8eca137bd5da85e26c63a5027e049d (diff) | |
| parent | 0c0e564019af4dac66150b1bfa5c13219b9eb752 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'src/entities')
| -rw-r--r-- | src/entities/Entity.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp index aa2114e8..b795931f 100644 --- a/src/entities/Entity.cpp +++ b/src/entities/Entity.cpp @@ -405,7 +405,7 @@ CEntity::PreRender(void) }else if(GetModelIndex() == MI_MISSILE){ CVector pos = GetPosition(); float flicker = (CGeneral::GetRandomNumber() & 0xF)/(float)0x10; - CShadows::StoreShadowToBeRendered(SHADOWTYPE_2, + CShadows::StoreShadowToBeRendered(SHADOWTYPE_ADDITIVE, gpShadowExplosionTex, &pos, 8.0f, 0.0f, 0.0f, -8.0f, 255, 200.0f*flicker, 160.0f*flicker, 120.0f*flicker, @@ -758,7 +758,7 @@ CEntity::ProcessLightsForEntity(void) // Light shadow if(effect->light.shadowRange != 0.0f){ if(lightOn){ - CShadows::StoreStaticShadow((uintptr)this + i, SHADOWTYPE_2, + CShadows::StoreStaticShadow((uintptr)this + i, SHADOWTYPE_ADDITIVE, effect->light.shadow, &pos, effect->light.shadowRange, 0.0f, 0.0f, -effect->light.shadowRange, @@ -768,7 +768,7 @@ CEntity::ProcessLightsForEntity(void) effect->col.b*CTimeCycle::GetSpriteBrightness()*effect->light.shadowIntensity/255.0f, 15.0f, 1.0f, 40.0f, false, 0.0f); }else if(lightFlickering){ - CShadows::StoreStaticShadow((uintptr)this + i, SHADOWTYPE_2, + CShadows::StoreStaticShadow((uintptr)this + i, SHADOWTYPE_ADDITIVE, effect->light.shadow, &pos, effect->light.shadowRange, 0.0f, 0.0f, -effect->light.shadowRange, |