mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-25 13:31:37 +00:00
rename SPF_STANDALONE_ANIMATIONS to SPF_LOCAL_ANIM
This commit is contained in:
parent
8ae93fb87f
commit
b7e5d3d052
4 changed files with 7 additions and 7 deletions
|
@ -297,7 +297,7 @@ void P_ThinkParticles (FLevelLocals *Level)
|
|||
i = particle->tnext;
|
||||
if (Level->isFrozen() && !(particle->flags &SPF_NOTIMEFREEZE))
|
||||
{
|
||||
if(particle->flags & SPF_STANDALONE_ANIMATIONS)
|
||||
if(particle->flags & SPF_LOCAL_ANIM)
|
||||
{
|
||||
particle->animData.SwitchTic++;
|
||||
}
|
||||
|
@ -386,7 +386,7 @@ void P_SpawnParticle(FLevelLocals *Level, const DVector3 &pos, const DVector3 &v
|
|||
particle->RollVel = rollvel;
|
||||
particle->RollAcc = rollacc;
|
||||
particle->flags = flags;
|
||||
if(flags & SPF_STANDALONE_ANIMATIONS)
|
||||
if(flags & SPF_LOCAL_ANIM)
|
||||
{
|
||||
TexAnim.InitStandaloneAnimation(particle->animData, texture, Level->maptime);
|
||||
}
|
||||
|
@ -1079,7 +1079,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(FLevelLocals, SpawnVisualThinker, SpawnVisualThink
|
|||
void DVisualThinker::UpdateSpriteInfo()
|
||||
{
|
||||
PT.style = ERenderStyle(GetRenderStyle());
|
||||
if((PT.flags & SPF_STANDALONE_ANIMATIONS) && PT.texture != AnimatedTexture)
|
||||
if((PT.flags & SPF_LOCAL_ANIM) && PT.texture != AnimatedTexture)
|
||||
{
|
||||
AnimatedTexture = PT.texture;
|
||||
TexAnim.InitStandaloneAnimation(PT.animData, PT.texture, Level->maptime);
|
||||
|
|
|
@ -64,7 +64,7 @@ enum EParticleFlags
|
|||
SPF_ROLL = 1 << 6,
|
||||
SPF_REPLACE = 1 << 7,
|
||||
SPF_NO_XY_BILLBOARD = 1 << 8,
|
||||
SPF_STANDALONE_ANIMATIONS = 1 << 9,
|
||||
SPF_LOCAL_ANIM = 1 << 9,
|
||||
};
|
||||
|
||||
class DVisualThinker;
|
||||
|
|
|
@ -1343,7 +1343,7 @@ void HWSprite::ProcessParticle(HWDrawInfo *di, particle_t *particle, sector_t *s
|
|||
else
|
||||
{
|
||||
bool has_texture = particle->texture.isValid();
|
||||
bool custom_animated_texture = (particle->flags & SPF_STANDALONE_ANIMATIONS) && particle->animData.ok;
|
||||
bool custom_animated_texture = (particle->flags & SPF_LOCAL_ANIM) && particle->animData.ok;
|
||||
|
||||
int particle_style = has_texture ? 2 : gl_particles_style; // Treat custom texture the same as smooth particles
|
||||
|
||||
|
@ -1449,7 +1449,7 @@ void HWSprite::AdjustVisualThinker(HWDrawInfo* di, DVisualThinker* spr, sector_t
|
|||
if (paused || spr->isFrozen())
|
||||
timefrac = 0.;
|
||||
|
||||
bool custom_anim = ((spr->PT.flags & SPF_STANDALONE_ANIMATIONS) && spr->PT.animData.ok);
|
||||
bool custom_anim = ((spr->PT.flags & SPF_LOCAL_ANIM) && spr->PT.animData.ok);
|
||||
|
||||
texture = TexMan.GetGameTexture(
|
||||
custom_anim
|
||||
|
|
|
@ -710,7 +710,7 @@ enum EParticleFlags
|
|||
SPF_ROLL = 1 << 6,
|
||||
SPF_REPLACE = 1 << 7,
|
||||
SPF_NO_XY_BILLBOARD = 1 << 8,
|
||||
SPF_STANDALONE_ANIMATIONS = 1 << 9,
|
||||
SPF_LOCAL_ANIM = 1 << 9,
|
||||
|
||||
SPF_RELATIVE = SPF_RELPOS|SPF_RELVEL|SPF_RELACCEL|SPF_RELANG
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue