diff options
| author | Kevin Hockey <Blitzkev@gmail.com> | 2010-06-29 19:20:39 (GMT) |
|---|---|---|
| committer | Kevin Hockey <Blitzkev@gmail.com> | 2010-06-29 19:20:39 (GMT) |
| commit | 854433931b4c266324936bef515ae58dafcdaec3 (patch) | |
| tree | 3dd8378f6a66249c551559e8c445a2e7cd60b638 /MAFH2/BattleEngine.py | |
| parent | 936c0a5859aff07c702ce4b8ef2ce38ab6ebf413 (diff) | |
| parent | 14fa19cb237de96d93a1f1cc7c3ba178ceb2fc2e (diff) | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/fortune_hunter
Diffstat (limited to 'MAFH2/BattleEngine.py')
| -rw-r--r-- | MAFH2/BattleEngine.py | 7 |
1 files changed, 1 insertions, 6 deletions
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) |