Convert the emote system to use particles

Reviewed-by: Jared Adams

1 files changed, 0 insertions, 21 deletions

diff --git a/src/being.cpp b/src/being.cpp
index 585e7352..95f2ecdd 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -80,7 +80,6 @@ Being::Being(int id, Type type, int subtype, Map *map):
     ActorSprite(id),
     mInfo(BeingInfo::Unknown),
     mActionTime(0),
-    mEmotion(0), mEmotionTime(0),
     mSpeechTime(0),
     mAttackType(1),
     mAttackSpeed(350),
@@ -869,13 +868,6 @@ void Being::logic()
                     mY * 32 + 32 + getYOffset());
     }
 
-    if (mEmotion != 0)
-    {
-        mEmotionTime--;
-        if (mEmotionTime == 0)
-            mEmotion = 0;
-    }
-
     ActorSprite::logic();
 
     int frameCount = getFrameCount();
@@ -891,19 +883,6 @@ void Being::logic()
     }
 }
 
-void Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY)
-{
-    if (!mEmotion)
-        return;
-
-    const int px = getPixelX() - offsetX - 16;
-    const int py = getPixelY() - offsetY - 64 - 32;
-    const int emotionIndex = mEmotion - 1;
-
-    if (emotionIndex >= 0 && emotionIndex <= EmoteDB::getLast())
-        EmoteDB::getAnimation(emotionIndex)->draw(graphics, px, py);
-}
-
 void Being::drawSpeech(int offsetX, int offsetY)
 {
     const int px = getPixelX() - offsetX;