diff options
-rw-r--r-- | src/api/Game.py | 11 | ||||
-rw-r--r-- | src/game/Area1Game1.py | 5 | ||||
-rw-r--r-- | src/game/Area1Game3.py | 2 | ||||
-rw-r--r-- | src/game/Area1Game5.py | 2 | ||||
-rw-r--r-- | src/game/Area1Game6.py | 6 |
5 files changed, 12 insertions, 14 deletions
diff --git a/src/api/Game.py b/src/api/Game.py index d336e13..38b3119 100644 --- a/src/api/Game.py +++ b/src/api/Game.py @@ -22,7 +22,6 @@ class CGame(object): def __new__(self, *args, **kargs):
if (self.mInstance is None):
self.mInstance = object.__new__(self, *args, **kargs)
- #self.setState(self.mInstance, aState)
self.init(self.mInstance)
#else:
# print "Warning: CGame(): You are not allowed to instantiate it more than once."
@@ -64,12 +63,12 @@ class CGame(object): pygame.init()
#pygame.display.init()
#pygame.font.init()
+
self.mState = None
self.mScale = 1
self.mWidth = 1200
self.mHeight = 900
-
self.mScreen = pygame.display.get_surface()
if not(self.mScreen):
info = pygame.display.Info()
@@ -86,6 +85,7 @@ class CGame(object): self.mScreen = pygame.display.set_mode((self.mWidth, self.mHeight), pygame.FULLSCREEN)
pygame.display.set_caption(_('JES'))
+ # all is drawed on window..
self.window = pygame.Surface((1200, 900), 0, self.mScreen)
self.mBackground = pygame.Surface(self.window.get_size())
self.mBackground.fill((255, 0, 0))
@@ -112,6 +112,7 @@ class CGame(object): def gameLoop(self):
print "starting game.."
+
while not self.mQuit:
while gtk.events_pending():
@@ -132,11 +133,13 @@ class CGame(object): self.mAllSprites.clear(self.window, self.mBackground)
self.mAllSprites.update()
self.mAllSprites.draw(self.window)
+
if self.mScale == 1:
self.mScreen.blit(self.window, (0, 0))
else:
- s = pygame.transform.scale(self.window, (self.mWidth, self.mHeight))
- self.mScreen.blit(s, (0, 0))
+ scaled = pygame.transform.scale(self.window, (self.mWidth, self.mHeight))
+ self.mScreen.blit(scaled, (0, 0))
+
pygame.display.flip()
self.mClock.tick(30)
#print ("FPS: %.0f" % self.mClock.get_fps())
diff --git a/src/game/Area1Game1.py b/src/game/Area1Game1.py index 23ed8a0..4c218fc 100644 --- a/src/game/Area1Game1.py +++ b/src/game/Area1Game1.py @@ -141,7 +141,7 @@ class CArea1Game1(CGameState): CGameState.__init__(self) self.mBackground = None - self.mInstructions = None + self.mButtonPlay = None self.mListOptions = [] self.mListPieces = [] @@ -302,8 +302,7 @@ class CArea1Game1(CGameState): def destroy(self): CGameState.destroy(self) - #self.mInstructions.destroy() - self.mInstructions = None + CGame().removeChild(self.mButtonBack) CGame().removeChild(self.mPoints) CGame().removeChild(self.mBox) diff --git a/src/game/Area1Game3.py b/src/game/Area1Game3.py index 9eea915..af039aa 100644 --- a/src/game/Area1Game3.py +++ b/src/game/Area1Game3.py @@ -21,7 +21,7 @@ class CArea1Game3(CGameState): CGameState.__init__(self) self.mBackground = None - self.mInstructions = None + self.mButtonBack = None self.mLabelQuestion = None self.mButtonTrue = None diff --git a/src/game/Area1Game5.py b/src/game/Area1Game5.py index 50caabf..2a7bb06 100644 --- a/src/game/Area1Game5.py +++ b/src/game/Area1Game5.py @@ -21,7 +21,7 @@ class CArea1Game5(CGameState): CGameState.__init__(self) self.mBackground = None - self.mInstructions = None + self.mButtonBackA1G3 = None self.mLabelQuestion = None self.mButtonTrue = None diff --git a/src/game/Area1Game6.py b/src/game/Area1Game6.py index cb5da47..a01e54b 100644 --- a/src/game/Area1Game6.py +++ b/src/game/Area1Game6.py @@ -141,7 +141,7 @@ class CArea1Game6(CGameState): CGameState.__init__(self) self.mBackground = None - self.mInstructions = None + #mX = 10 self.mButtonPlay = None self.mListHelps = [] @@ -156,10 +156,6 @@ class CArea1Game6(CGameState): self.mBad = 0 self.mGood = 0 - - #self.mInstructions = CMultiLabel() - #CGame().addChild(self.mInstructions) - #print self.mX for i in range(10): self.mListHelps.insert(i, None) |