Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/MAFH2/BattleEngine.py
diff options
context:
space:
mode:
authorslm <jtmengel@gmail.com>2010-07-20 17:06:41 (GMT)
committer slm <jtmengel@gmail.com>2010-07-20 17:06:41 (GMT)
commit4aa785e666c6d8827179d77bd7a75d19500122f3 (patch)
tree29d4b8697da6adcd48c7832f708f7b4d945ec764 /MAFH2/BattleEngine.py
parent9c0482988b9e30f46794a26e30c09c9287b45d2c (diff)
Passing what updates I've made to allow Dave to edit the files I've been working in temporarily.
Diffstat (limited to 'MAFH2/BattleEngine.py')
-rw-r--r--MAFH2/BattleEngine.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/MAFH2/BattleEngine.py b/MAFH2/BattleEngine.py
index d9fe417..8a0da13 100644
--- a/MAFH2/BattleEngine.py
+++ b/MAFH2/BattleEngine.py
@@ -4,6 +4,7 @@ from BattleMenu import BattleMenuHolder
from MagicMenu import MagicMenuHolder
from AnimatedSprite import Spritesheet
from Items import get_item
+from drawableobject import DrawableObject, DynamicDrawableObject, Spritesheet
import pygame
from constants import CHAR_PATH, HUD_PATH
@@ -44,8 +45,8 @@ class BattleEngine(GameEngineElement):
for i in ['arrow_select']:
self.__images[i] = pygame.image.load( HUD_PATH + i + ".gif" ) #-----------------------------------------------------------------------------
- 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.__images['hp'] = Spritesheet( HUD_PATH + "hp.gif" ).img_extract(11,1,100,100) #------------------------------------------------------------
+ self.__images['bt'] = Spritesheet( HUD_PATH + "bt.gif" ).img_extract(1,11,100,25) #-------------------------------------------------------------
self.add_to_engine()
self.game_engine.add_object('battlemenu', BattleMenuHolder( self.menu_callback ) )