aslaksmd

3 files changed, 14 insertions, 13 deletions

diff --git a/MAFH2/BattleEngine.py b/MAFH2/BattleEngine.py
index 5bc9261..b9769e4 100644
--- a/MAFH2/BattleEngine.py
+++ b/MAFH2/BattleEngine.py
@@ -4,9 +4,9 @@ from BattleMenu import BattleMenuHolder
 from MagicMenu import MagicMenuHolder
 from Spritesheet import Spritesheet
 from Items import get_item
-from DrawableObject import DrawableObject
-from DynamicDrawableObject import DynamicDrawableObject
-from Scene import Scene
+from fortuneengine.DrawableObject import DrawableObject
+from fortuneengine.DynamicDrawableObject import DynamicDrawableObject
+from fortuneengine.Scene import Scene
 import pygame
 
 from constants import CHAR_PATH, HUD_PATH
@@ -41,8 +41,9 @@ class BattleEngine(GameEngineElement):
             e_index = self.current_room.get_enemy( i )
 
             if e_index != '0':
-                self.enemy_list.append( get_enemy( e_index ) )
-                self.get_engine.get_scene().addObjects([get_enemy(e_index)])
+                curE = get_enemy( e_index )
+                self.enemy_list.append( curE )
+                self.game_engine.get_scene().addObjects([curE.get_sprite()])
 
         # Preload images
         self.__drawableObjects = {}
@@ -51,7 +52,7 @@ class BattleEngine(GameEngineElement):
 
         self.__drawableObjects['hp'] = DrawableObject(Spritesheet( HUD_PATH + "hp.gif" ).img_extract(11,1,100,100), '')
         self.__drawableObjects['bt'] = DrawableObject(Spritesheet( HUD_PATH + "bt.gif" ).img_extract(1,11,100,25), '')
-        self.get_engine.get_scene().addObjects(self.__drawableObjects)
+        self.game_engine.get_scene().addObjects(self.__drawableObjects)
 
         self.add_to_engine()
         self.game_engine.add_object('battlemenu', BattleMenuHolder( self.menu_callback ) )
@@ -405,4 +406,4 @@ class BattleEngine(GameEngineElement):
         #what the hell does ^^ do??
 #        pygame.display.update(_dirtyList)                                                           #5 new
         
-        self.get_engine.get_scene().update(clock.get_time())
+        self.game_engine.get_scene().update(clock.get_time())
diff --git a/MAFH2/Enemy.py b/MAFH2/Enemy.py
index 31f8384..afc4c37 100644
--- a/MAFH2/Enemy.py
+++ b/MAFH2/Enemy.py
@@ -1,7 +1,7 @@
 from gettext import gettext as _
 from constants import CHAR_PATH
 #from drawableobject.DrawableObject import DrawableObject
-from fortunengine.DynamicDrawableObject import DynamicDrawableObject
+from fortuneengine.DynamicDrawableObject import DynamicDrawableObject
 class InvalidEnemyException(Exception): pass
 
 import pygame
@@ -52,7 +52,9 @@ class Enemy(Actor):
             return int((self.ATT+self.BAE) * 1.5)
         elif name=="special":
             return int((self.ATT+self.BAE) * 1.3)
-
+    
+    def get_sprite(self):
+        return self.sprite
 
 def get_enemy(key):
     if key in ENEMY:
@@ -60,6 +62,4 @@ def get_enemy(key):
     else:
         raise InvalidEnemyException()
         
-def get_sprite(self):
 
-   return self.sprite
\ No newline at end of file
diff --git a/MAFH2/fortuneengine/GameEngine.py b/MAFH2/fortuneengine/GameEngine.py
index ccbd0bb..f7496df 100644
--- a/MAFH2/fortuneengine/GameEngine.py
+++ b/MAFH2/fortuneengine/GameEngine.py
@@ -215,13 +215,13 @@ class GameEngine(object):
                  fnc(screen, tick_time)
                  self.__draw_time[str(fnc)] += time() - start
                  self.__draw_calls[str(fnc)] += 1
-            self.__scene.update(tick_time)
             # Print Frame Rate
             if self.__showfps:
                 text = self.__font.render('FPS: %d' % self.clock.get_fps(),
                        False, (255, 255, 255), (159, 182, 205))
                 screen.blit(text, (0, 0))
-                pygame.display.flip()
+            pygame.display.flip()
+            self.__scene.update(tick_time)
 
 
     def _event_loop(self):