Enabled monster emotions.

2 files changed, 14 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index ec10fff6..0d6282f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* data/items.xml: Changed item properties according to eAthena scripting
 	capabilities.
+	* src/being.cpp: Enabled monster emotions.
 
 2005-12-12  Eugenio Favalli  <elvenprogrammer@gmail.com>
 
diff --git a/src/being.cpp b/src/being.cpp
index 6b26afad..2bea8341 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -345,14 +345,6 @@ Being::logic()
                 }
                 break;
         }
-
-        if (emotion != 0)
-        {
-            emotion_time--;
-            if (emotion_time == 0) {
-                emotion = 0;
-            }
-        }
     }
 
     if (getType() == MONSTER && action != STAND)
@@ -374,6 +366,14 @@ Being::logic()
         mPy += getYOffset();
         mPx += getXOffset();
     }
+    
+    if (emotion != 0)
+    {
+        emotion_time--;
+        if (emotion_time == 0) {
+            emotion = 0;
+        }
+    }
 }
 
 void
@@ -592,6 +592,11 @@ Being::draw(Graphics *graphics, int offsetX, int offsetY)
             graphics->drawImage(
                     monsterset[job-1002]->spriteset[dir + 4 * frame],
                     px - 12, py - 25);
+            if (emotion != 0)
+            {
+                graphics->drawImage(emotionset->spriteset[emotion - 1],
+                                    px + 3, py - 60);
+            }
             break;
 
         default: