modify files with the new nomenclator

5 files changed, 16 insertions, 15 deletions

diff --git a/src/api/Button.py b/src/api/Button.py
index f45ca15..65fa133 100755
--- a/src/api/Button.py
+++ b/src/api/Button.py
@@ -1,6 +1,6 @@
 import pygame

-import CLabel

-from CLabel import *

+import api.Label

+from api.Label import CLabel

 

 class CButton(CLabel):

     """ a button based on the label 

diff --git a/src/api/Game.py b/src/api/Game.py
index 40c3179..d5ff8da 100755
--- a/src/api/Game.py
+++ b/src/api/Game.py
@@ -3,13 +3,14 @@ import pygame
 import pygame.font

 import pygame.display

 import pygame.sprite

-import CSuperSprite

-from CSuperSprite import *

-import CSprite

-from CSprite import *

 from pygame.locals import *

-import CMultiLabel

-from CMultiLabel import *

+

+import api.SuperSprite

+from SuperSprite import CSuperSprite

+import api.Sprite

+from api.Sprite import CSprite

+import api.MultiLabel

+from api.MultiLabel import CMultiLabel

 import gc

 

 class CGame(object):

diff --git a/src/api/MultiLabel.py b/src/api/MultiLabel.py
index 3371a7c..122ee13 100755
--- a/src/api/MultiLabel.py
+++ b/src/api/MultiLabel.py
@@ -18,7 +18,7 @@ class CMultiLabel(pygame.sprite.Sprite):
         #pygame.font.init()

         #print "CMultilabel"

         #print pygame.font.get_init()

-        self.font = pygame.font.Font("goodfoot.ttf", 30)

+        self.font = pygame.font.Font('assets/fonts/goodfoot.ttf', 30)

         self.fgColor = ((0x00, 0x00, 0x00))

         self.bgColor = ((0xFF, 0xFF, 0xFF))

         self.center = (100, 100)

diff --git a/src/api/Sprite.py b/src/api/Sprite.py
index aa746c6..0e933c8 100755
--- a/src/api/Sprite.py
+++ b/src/api/Sprite.py
@@ -3,10 +3,10 @@
 

 import pygame

 import math

-import CImage

-import CMath

-import CVector

-from CVector import *

+import api.Image

+import api.Math as CMath

+import api.Vector

+from api.Vector import CVector

 

 # TODO: Cambiar las conversiones de grados a radianes y viceversa usando las funciones.

 

@@ -55,7 +55,7 @@ class CSprite(pygame.sprite.Sprite):
         #create a default text image as a placeholder

         #This will usually be changed by a setImage call

         #self.font = pygame.font.Font("freesansbold.ttf", 30)

-        self.font = pygame.font.Font("goodfoot.ttf", 30)

+        self.font = pygame.font.Font('assets/fonts/goodfoot.ttf', 30)

         self.mImageMaster = self.font.render(">sprite>", True, (0, 0,0), (0xFF, 0xFF, 0xFF))

         

         # Set the image of the sprite.

diff --git a/src/api/SuperSprite.py b/src/api/SuperSprite.py
index 6105541..e8730d6 100755
--- a/src/api/SuperSprite.py
+++ b/src/api/SuperSprite.py
@@ -27,7 +27,7 @@ class CSuperSprite(pygame.sprite.Sprite):
         #This will usually be changed by a setImage call

         print "Csupersprite"

         print pygame.font.get_init()

-        self.font = pygame.font.Font("goodfoot.ttf", 30)

+        self.font = pygame.font.Font('assets/fonts/goodfoot.ttf', 30)

         self.imageMaster = self.font.render(">sprite>", True, (0, 0,0), (0xFF, 0xFF, 0xFF))

         self.image = self.imageMaster

         self.rect = self.image.get_rect()