From b7e5d3d052189f013bf62a415a66e907cc3574f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Lu=C3=ADs=20Vaz=20Silva?= Date: Tue, 9 Jan 2024 03:53:13 -0300 Subject: [PATCH] rename SPF_STANDALONE_ANIMATIONS to SPF_LOCAL_ANIM --- src/playsim/p_effect.cpp | 6 +++--- src/playsim/p_effect.h | 2 +- src/rendering/hwrenderer/scene/hw_sprites.cpp | 4 ++-- wadsrc/static/zscript/constants.zs | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/playsim/p_effect.cpp b/src/playsim/p_effect.cpp index ee5583fb76..430265a755 100644 --- a/src/playsim/p_effect.cpp +++ b/src/playsim/p_effect.cpp @@ -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); diff --git a/src/playsim/p_effect.h b/src/playsim/p_effect.h index 72a470ad6b..98f3d67897 100644 --- a/src/playsim/p_effect.h +++ b/src/playsim/p_effect.h @@ -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; diff --git a/src/rendering/hwrenderer/scene/hw_sprites.cpp b/src/rendering/hwrenderer/scene/hw_sprites.cpp index 87d3b61f5d..472a4f607c 100644 --- a/src/rendering/hwrenderer/scene/hw_sprites.cpp +++ b/src/rendering/hwrenderer/scene/hw_sprites.cpp @@ -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 diff --git a/wadsrc/static/zscript/constants.zs b/wadsrc/static/zscript/constants.zs index 89ea793d7e..85239ef044 100644 --- a/wadsrc/static/zscript/constants.zs +++ b/wadsrc/static/zscript/constants.zs @@ -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 };