1 files changed, 5 insertions, 3 deletions
diff --git a/src/engine.cpp b/src/engine.cpp
index 563247df..940bac79 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -275,6 +275,11 @@ void Engine::logic()
                 }
             }
         }
+        
+        if (get_elapsed_time(being->speech_time) > 5000)
+            being->showSpeech = false;
+        if (get_elapsed_time(being->damage_time) > 3000)
+            being->showDamage = false;
 
         if (being->action == MONSTER_DEAD && being->frame >= 20) {
             delete being;
@@ -471,9 +476,6 @@ void Engine::draw()
     while (beingIterator != beings.end()) {
         Being *being = (*beingIterator);
 
-        // Tick the beings (gives them a sense of time)
-        being->tick();
-
         being->drawSpeech(guiGraphics);
 
         beingIterator++;