remove unused imports

8 files changed, 16 insertions, 24 deletions

diff --git a/src/api/Anim.py b/src/api/Anim.py
index 0197452..2310f5e 100755
--- a/src/api/Anim.py
+++ b/src/api/Anim.py
@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+
+
 class CAnim(object):
 
     mNumFrames = 0
diff --git a/src/api/Button.py b/src/api/Button.py
index d3ab063..73e8d87 100755
--- a/src/api/Button.py
+++ b/src/api/Button.py
@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-

 

-import pygame

 from api.Label import CLabel

-

-from Mouse import *

+from Mouse import CMouse

 

 

 class CButton(CLabel):

diff --git a/src/api/Game.py b/src/api/Game.py
index 37d0873..40b61f6 100755
--- a/src/api/Game.py
+++ b/src/api/Game.py
@@ -3,14 +3,9 @@
 import gc

 import gtk

 import pygame

-#from pygame.locals import *

 import pygame.font

 import pygame.display

 import pygame.sprite

-from pygame.locals import *

-

-import api.SuperSprite

-from SuperSprite import CSuperSprite

 from api.Sprite2 import CSprite

 from api.Mouse import CMouse 

 

@@ -109,8 +104,8 @@ class CGame(object):
             for event in pygame.event.get():

                 if event.type == pygame.QUIT:

                     self.mQuit = True

-                elif event.type == KEYDOWN:

-                    if event.key == K_ESCAPE:

+                elif event.type == pygame.KEYDOWN:

+                    if event.key == pygame.K_ESCAPE:

                         self.mQuit = True

         

                 #self.doEvents(event)

diff --git a/src/api/Globe.py b/src/api/Globe.py
index 6c84b80..7353bcb 100644
--- a/src/api/Globe.py
+++ b/src/api/Globe.py
@@ -2,7 +2,6 @@
 
 import pygame
 import Image
-from api.Sprite2 import CSprite
 
 path = 'assets/images/dialog/'
 
diff --git a/src/api/Math.py b/src/api/Math.py
index 8b8eefc..1c02a11 100755
--- a/src/api/Math.py
+++ b/src/api/Math.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python

 # -*- coding: utf-8 -*-

-#cp1252

 

 import math

 

diff --git a/src/api/Sprite.py b/src/api/Sprite.py
index 3829225..39dbec8 100755
--- a/src/api/Sprite.py
+++ b/src/api/Sprite.py
@@ -6,10 +6,9 @@ import pygame
 import math

 import Image

 import api.Math as CMath

-import api.Vector

 from api.Vector import CVector

 

-from Mouse import *

+from Mouse import CMouse

 

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

 

@@ -58,14 +57,14 @@ class CSpriteOLD(pygame.sprite.Sprite):
         self.setBounds(0, 0, 1200, 900)

         

         # Constants for the actions then the sprite reaches a border.

-        CSprite.WRAP = 0        # Wrap around the edges.

-        CSprite.BOUNCE = 1      # Bounce off the screen changing direction.

-        CSprite.STOP = 2        # Stop at the edge of the screen.

-        CSprite.HIDE = 3        # Move off-stage and stop.

-        CSprite.CONTINUE = 4    # Move on forever.

+        #CSprite.WRAP = 0        # Wrap around the edges.

+        #CSprite.BOUNCE = 1      # Bounce off the screen changing direction.

+        #CSprite.STOP = 2        # Stop at the edge of the screen.

+        #CSprite.HIDE = 3        # Move off-stage and stop.

+        #CSprite.CONTINUE = 4    # Move on forever.

 

         # Action for the sprite when it reaches a border.

-        self.mBoundAction = CSprite.WRAP

+        #self.mBoundAction = CSprite.WRAP

                 

                 

                 

diff --git a/src/api/Sprite2.py b/src/api/Sprite2.py
index edc02a3..59711f5 100755
--- a/src/api/Sprite2.py
+++ b/src/api/Sprite2.py
@@ -4,11 +4,9 @@
 import pygame

 import math

 import Image

-import api.Math as CMath

-import api.Vector

 from api.Vector import CVector

 

-from Mouse import *

+from Mouse import CMouse

 

 class CSprite(pygame.sprite.Sprite):

     """ An enhanced Sprite class

diff --git a/src/api/Vector.py b/src/api/Vector.py
index e474541..64a9703 100755
--- a/src/api/Vector.py
+++ b/src/api/Vector.py
@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-

 

 import math

-from math import *

+from math import cos

+from math import sin

 

 class CVector(object):