modify multilabel api

3 files changed, 19 insertions, 15 deletions

diff --git a/src/api/Label.py b/src/api/Label.py
index f4ff9ac..a034716 100755
--- a/src/api/Label.py
+++ b/src/api/Label.py
@@ -49,7 +49,6 @@ class CLabel(pygame.sprite.Sprite):
         xPos = (self.image.get_width() - fontSurface.get_width())/2

         self.image.blit(fontSurface, (xPos, 0))

 

-    def update(self):

-        

+    def update(self):        

         self.rect = self.image.get_rect()

-        self.rect.center = self.center
\ No newline at end of file
+        self.rect.center = self.center

diff --git a/src/api/MultiLabel.py b/src/api/MultiLabel.py
index 53c6445..e6af4b6 100755
--- a/src/api/MultiLabel.py
+++ b/src/api/MultiLabel.py
@@ -28,11 +28,15 @@ class CMultiLabel(CSprite):
         self.size = (300, 150)

         self.createImage()

     

-    def setSize(self, x, y):

-        self.size = (x, y)

+    def set_center(self, aCenter):

+        self.center = aCenter

+        self.createImage()

+        

+    def set_size(self, aSize):

+        self.size = aSize

         self.createImage()

 

-    def setText(self, aText):

+    def set_text(self, aText):

         self.text = aText

         self.createImage()

 

@@ -56,5 +60,6 @@ class CMultiLabel(CSprite):
         self.rect.center = self.center

         self.setImage(self.image)

 

-    #def update(self):

-        #print "update de multilabel"

+    def update(self):

+        self.rect = self.image.get_rect()

+        self.rect.center = self.center

diff --git a/src/game/Area1Game6.py b/src/game/Area1Game6.py
index 5d5acc0..4c98fe1 100644
--- a/src/game/Area1Game6.py
+++ b/src/game/Area1Game6.py
@@ -5,7 +5,7 @@ import sys
 import pygame
 from api.Sprite import CSprite
 from api.Button import CButton
-from api.Label import CLabel
+from api.MultiLabel import CMultiLabel
 from api.Mouse import *
 import api.Math as Math
 import api.Image as Image
@@ -273,18 +273,18 @@ class CArea1Game6(CGameState):
         
         
         # Label with the Help (for mouseover)
-        self.mHelp01 = CLabel()
+        self.mHelp01 = CMultiLabel()
         self.mHelp01.bgColor = (0x99, 0x99, 0x66)
         self.mHelp01.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 20)
         self.mHelp01.set_center((914, 188))
-        self.mHelp01.set_size((500, 280))
+        self.mHelp01.set_size((350, 280))
         self.mHelp01.set_text(self.dic_help[1])
         
-        self.mHelp02 = CLabel()
+        self.mHelp02 = CMultiLabel()
         self.mHelp02.bgColor = (0x99, 0x99, 0x66)
         self.mHelp02.font = pygame.font.Font('assets/fonts/DejaVuSans.ttf', 20)
         self.mHelp02.set_center((914, 188))
-        self.mHelp02.set_size((500, 280))
+        self.mHelp02.set_size((350, 280))
         self.mHelp02.set_text(self.dic_help[2])
         
         #CGame().addChild(self.mHelp01)
@@ -348,9 +348,9 @@ class CArea1Game6(CGameState):
         a_path = os.path.abspath(r_path)
         f = None
         try:
-            f = imp.load_source('area1game7_data', a_path)
+            f = imp.load_source('area1game6_data', a_path)
         except:
-            print _('Cannot open %s') % 'area1game7_data'
+            print _('Cannot open %s') % 'area1game6_data'
 
         if f:
             #if hasattr(f, 'EXPLORATIONS'):