From 854433931b4c266324936bef515ae58dafcdaec3 Mon Sep 17 00:00:00 2001
From: Kevin Hockey <Blitzkev@gmail.com>
Date: Tue, 29 Jun 2010 19:20:39 +0000
Subject: Merge branch 'master' of ssh://git.fedorahosted.org/git/fortune_hunter

---
(limited to 'MAFH2/BattleEngine.py')

diff --git a/MAFH2/BattleEngine.py b/MAFH2/BattleEngine.py
index 63c63d4..8ae89aa 100644
--- a/MAFH2/BattleEngine.py
+++ b/MAFH2/BattleEngine.py
@@ -44,8 +44,6 @@ class BattleEngine(GameEngineElement):
         self.__images['hp'] = Spritesheet( HUD_PATH + "hp.png" ).img_extract(11,1,100,100)
         self.__images['bt'] = Spritesheet( HUD_PATH + "bt.png" ).img_extract(1,11,100,25)
 
-        self.game_engine.start_event_timer(1, 150)
-
         self.add_to_engine()
         self.game_engine.add_object('battlemenu', BattleMenuHolder( self.menu_callback ) )
         self.game_engine.get_object('battlemenu').show_menu('selection')
@@ -286,10 +284,7 @@ class BattleEngine(GameEngineElement):
             self.game_engine.get_object('magicmenu').remove_from_engine()
 
     def event_handler(self, event):
-        if event.type == pygame.USEREVENT+1:
-            return True
-
-        elif event.type == pygame.KEYDOWN:
+        if event.type == pygame.KEYDOWN:
 
             newKey=pygame.key.name(event.key)
 
--
cgit v0.9.1