map and major map displaying

3 files changed, 11 insertions, 5 deletions

diff --git a/MAFH2/Dungeon.py b/MAFH2/Dungeon.py
index bb5f099..f3bc983 100644
--- a/MAFH2/Dungeon.py
+++ b/MAFH2/Dungeon.py
@@ -37,7 +37,7 @@ class Dungeon(GameEngineElement):
             x,y = self.start
             profile.move_to( x, y )
 
-        self.add_to_engine()
+        
 
         self.doorsList = []
 
@@ -63,6 +63,7 @@ class Dungeon(GameEngineElement):
         self.itemsList[2].setPosition(self.game_engine.art_scale(1100, 1200, True),self.game_engine.art_scale(600, 900, False))
         self.itemsList[3].setPosition(self.game_engine.art_scale(900, 1200, True),self.game_engine.art_scale(330, 900, False))
         self.game_engine.get_scene().addObjects(self.itemsList)
+        self.add_to_engine()
 
     def add_to_engine(self):
         super(Dungeon, self).add_to_engine()
diff --git a/MAFH2/Map.py b/MAFH2/Map.py
index 3d12eab..ad615ce 100644
--- a/MAFH2/Map.py
+++ b/MAFH2/Map.py
@@ -124,7 +124,9 @@ class Map(GameEngineElement):
         font=pygame.font.SysFont("cmr10",24,False,False)

 

         macroMap=pygame.transform.scale(self.totalSurface,(self.sizeX*100,self.sizeY*100))

-        screen.fill((0,0,0),(200,0,800,700))

+        tempScreen = pygame.Surface((800,700))

+        tempScreen.fill((0,0,0))

+        #screen.fill((0,0,0),(200,0,800,700))

         legend=pygame.Surface((200,300))

         legend.fill((255,0,0),(0,0,40,15))

         legend.blit(font.render(_("LOCKED"),True,(255,0,0)),(45,0,30,5))

@@ -136,8 +138,12 @@ class Map(GameEngineElement):
         legend.blit(font.render(_("EXIT"),True,(255,255,255)),(45,75,30,5))

         legend.fill((50,50,50),(0,100,40,15))

         legend.blit(font.render(_("ENTRANCE"),True,(50,50,50)),(45,100,30,5))

-        screen.blit(legend,(800,0,300,300))

-        screen.blit(macroMap,(200,0,800,700))

+        tempScreen.blit(legend,(800,0,300,300))

+        tempScreen.blit(macroMap, (0,0))

+        self.myDrawableObject.repopulateImages([tempScreen])

+        self.myDrawableObject.setPosition(200,0)

+        

+        #screen.blit(macroMap,(200,0,800,700))

 

     def update_macro(self):

         profile = self.game_engine.get_object('profile')

diff --git a/MAFH2/TermBox.py b/MAFH2/TermBox.py
index c511e12..bb6660b 100644
--- a/MAFH2/TermBox.py
+++ b/MAFH2/TermBox.py
@@ -23,7 +23,6 @@ class TermBox(GameEngineElement):
 
     def add_line(self, line):
         for i in range(0, self.max_lines, 1):
-            print i
             if i == self.max_lines-1:
                 self.__lines[i].changeText(line, [255,255,255])
             else: