Amulet search fires once 100% instead of waiting for release

1 files changed, 9 insertions, 6 deletions

diff --git a/MAFH2/Dungeon.py b/MAFH2/Dungeon.py
index 9528407..0988b1e 100644
--- a/MAFH2/Dungeon.py
+++ b/MAFH2/Dungeon.py
@@ -229,16 +229,19 @@ class Dungeon(GameEngineElement):
             newKey=pygame.key.name(event.key)
 
             if newKey=='[1]' or newKey=='e':
-                if time() - self.pickup_time < SEARCH_TIME:
-                    self.item_pickup()
+                if hasattr( self, 'pickup_time' ):
+                    if time() - self.pickup_time < SEARCH_TIME:
+                        self.item_pickup()
 
-                else:
-                    self.amulet_search()
+                    self.game_engine.stop_event_timer( 0 )
+                    del self.pickup_time
+                return True
 
+        elif event.type == pygame.USEREVENT:
+            if time() - self.pickup_time > SEARCH_TIME:
                 self.game_engine.stop_event_timer( 0 )
                 del self.pickup_time
-                return True
-        elif event.type == pygame.USEREVENT:
+                self.amulet_search()
             #ANIMATION
             return True