fix: attached effect looping more than it should

mehah · Nov 13, 2023 · b2a54a5 · b2a54a5
1 parent ae89ea0
commit b2a54a5
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/client/attachedeffect.cpp b/src/client/attachedeffect.cpp
@@ -52,8 +52,8 @@ void AttachedEffect::draw(const Point& dest, bool isOnTop, LightView* lightView)
         const int animation = getCurrentAnimationPhase();
         if (m_loop > -1 && animation != m_lastAnimation) {
             m_lastAnimation = animation;
-            if (animation == 0)
-                --m_loop;
+            if (animation == 0 && --m_loop == 0)
+                return;
         }
 
         if (m_shader) g_drawPool.setShaderProgram(m_shader, true);
@@ -75,8 +75,10 @@ void AttachedEffect::draw(const Point& dest, bool isOnTop, LightView* lightView)
 
 int AttachedEffect::getCurrentAnimationPhase()
 {
-    if (m_texture)
+    if (m_texture) {
+        m_texture->get(m_frame, m_animationTimer);
         return m_frame;
+    }
 
     const auto* animator = m_thingType->getIdleAnimator();
     if (!animator && m_thingType->isAnimateAlways())