Skip to content

Commit

Permalink
rename SPF_STANDALONE_ANIMATIONS to SPF_LOCAL_ANIM
Browse files Browse the repository at this point in the history
  • Loading branch information
RicardoLuis0 committed Jan 9, 2024
1 parent 9389af2 commit 44c22a5
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions src/playsim/p_effect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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++;
}
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/playsim/p_effect.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/rendering/hwrenderer/scene/hw_sprites.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion wadsrc/static/zscript/constants.zs
Original file line number Diff line number Diff line change
Expand Up @@ -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
};
Expand Down

0 comments on commit 44c22a5

Please sign in to comment.