From 1def592c10613885a9438fc92c82917abe394e82 Mon Sep 17 00:00:00 2001 From: Alan Aguiar Date: Sat, 26 Oct 2013 19:38:10 +0000 Subject: some cleans --- (limited to 'src/api/Game.py') diff --git a/src/api/Game.py b/src/api/Game.py index 7aa7ce2..218e5f6 100644 --- a/src/api/Game.py +++ b/src/api/Game.py @@ -3,9 +3,9 @@ import gc import gtk import pygame -import pygame.font -import pygame.display -import pygame.sprite +#import pygame.font +#import pygame.display +#import pygame.sprite from api.Sprite2 import CSprite from api.Mouse import CMouse from PartidasMan import getPartidasFromFile @@ -18,17 +18,6 @@ import Image class CGame(object): mInstance = None - mState = None - mScreen = None - mBackground = None - mAllSprites = None - mMousePointerSprite = None - mMouse = None - mGroups = None - mMainSprites = None - mClock = None - mQuit = False - mPartidaDict = {} def __new__(self, *args, **kargs): if (self.mInstance is None): @@ -75,11 +64,12 @@ class CGame(object): pygame.init() #pygame.display.init() #pygame.font.init() - #screen = pygame.display.set_mode((1200, 900), FULLSCREEN) + self.mState = None + self.mScreen = pygame.display.get_surface() if not(self.mScreen): self.mScreen = pygame.display.set_mode((1200, 900)) - pygame.display.set_caption(_('Game')) + pygame.display.set_caption(_('Game')) self.mBackground = pygame.Surface(self.mScreen.get_size()) self.mBackground.fill((255, 0, 0)) @@ -88,13 +78,13 @@ class CGame(object): #pygame.mixer.init() #self.mAllSprites = pygame.sprite.Group() - Sprites = [] - self.mAllSprites = pygame.sprite.LayeredUpdates(Sprites) + self.mAllSprites = pygame.sprite.LayeredUpdates() pygame.mouse.set_visible(False) self.mMouse = CMouse() self.mMousePointerSprite = CSprite() self.mMousePointerSprite.setImage(Image.loadImage('assets/images/cursor.png', True)) + #insert mouse pointer at layer 5 self.addChild(self.mMousePointerSprite, 5) self.mScreen.blit(self.mBackground, (0, 0)) @@ -120,21 +110,13 @@ class CGame(object): self.mMouse.update() self.mMousePointerSprite.setXY(self.mMouse.getX(), self.mMouse.getY()) - - #self.mState.preUpdate() + self.mState.update() self.mAllSprites.clear(self.mScreen, self.mBackground) self.mAllSprites.update() self.mAllSprites.draw(self.mScreen) - #for group in self.mAllSprites: - # group.clear(self.mScreen, self.mBackground) - # group.update() - # group.draw(self.mScreen) - - #self.mState.postUpdate() - pygame.display.flip() self.mClock.tick(30) #print ("FPS: %.0f" % self.mClock.get_fps()) -- cgit v0.9.1