From 9a4107b7ec0f92e0f101969358a82b024c810ffc Mon Sep 17 00:00:00 2001
From: davesilver <nibor123@gmail.com>
Date: Wed, 04 Aug 2010 18:22:25 +0000
Subject: Merge branch 'animationrework' of git+ssh://git.fedorahosted.org/git/fortune_hunter into animationrework

---
diff --git a/MAFH2/BattleEngine.py b/MAFH2/BattleEngine.py
index 4b17877..b9e2b1a 100644
--- a/MAFH2/BattleEngine.py
+++ b/MAFH2/BattleEngine.py
@@ -307,7 +307,7 @@ class BattleEngine(GameEngineElement):
             if enemy.HP <= 0:
                 enemy.alive = False
                 self.enemy_list.remove(enemy)
-                enemy.makeTransparent(True)
+                enemy.get_sprite().makeTransparent(True)
                 self.active_target = 1
             if enemy.alive:
                 random.seed()
@@ -348,10 +348,10 @@ class BattleEngine(GameEngineElement):
                 room.remove_item( i )
                 self.game_engine.get_object('mesg').add_line(_("%s dropped!")% item.name)
         room.has_enemy = False
+        
         #self terminate
         #print 'end battle called'
         self.remove_from_engine()
-        self.game_engine.get_scene().removeObject(self.background)
         for object in self.__drawableObjects:
             self.game_engine.get_scene().removeObject(object)
             
diff --git a/MAFH2/BattleMenu.py b/MAFH2/BattleMenu.py
index 9ab073e..0d1b12d 100644
--- a/MAFH2/BattleMenu.py
+++ b/MAFH2/BattleMenu.py
@@ -16,9 +16,9 @@ class BattleMenuHolder( GameEngineElement ):
         self.callback = callback
         self.background = DrawableObject([pygame.image.load( MENU_PATH + "battleMenubackground.gif")], '')
         self.game_engine.get_scene().addObject(self.background)
-        self.disp = ""
-        self.sec_des = ""
         self.font = pygame.font.SysFont("cmr10",18,False,False)
+        self.disp = DrawableFontObject("", self.font)
+        self.sec_des = DrawableFontObject("", self.font)
 
     def set_disp(self, msg):
         self.disp = msg
diff --git a/MAFH2/fortuneengine/DrawableObject.py b/MAFH2/fortuneengine/DrawableObject.py
index 7700881..5b4621e 100644
--- a/MAFH2/fortuneengine/DrawableObject.py
+++ b/MAFH2/fortuneengine/DrawableObject.py
@@ -11,11 +11,11 @@ class DrawableObject(pygame.sprite.Sprite):
             self._images.append(images[i].convert_alpha())
             self._origImages.append(images[i].convert_alpha())
             
-        self.blank = pygame.Surface((0,0))
+        blank = pygame.Surface((0,0))
         
         if(transparent):
             for i in range(len(images)):
-                self._images[i] = self.blank
+                self._images[i] = blank
 
         self._start = pygame.time.get_ticks()
         self.image = self._images[0]
@@ -123,11 +123,11 @@ class DrawableObject(pygame.sprite.Sprite):
     def makeTransparent(self, bool = True):
        if bool == True:
             surf = pygame.Surface((0,0))
-            surf.fill((255, 255, 255, 0))
-            surf.convert_alpha()
-            self._images[self._frame] = surf
+            for i in range(len(self._images)):
+                self._images[i] = surf
        else:
-            self._images[self._frame] = self._origImages[self._frame]
+            for i in range(len(self._images)):
+                self._images[i] = self._origImages[i]
             self.image = self._images[self._frame]
 
     def setColorKey(self, aColor):
--
cgit v0.9.1