Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Quiñones <manuq@laptop.org>2012-05-30 21:27:17 (GMT)
committer Manuel Quiñones <manuq@laptop.org>2012-05-30 21:27:17 (GMT)
commit0267bdbfcabcefaefc0f2c349c9bed0c826a97f9 (patch)
tree6d6038e37716c8dc49e565e023efc13c00aad785
parent8cdd216e6dd8cd8b539b842de9dda889560fe54e (diff)
Rename private properties, level and ball, and add setup method
Signed-off-by: Manuel Quiñones <manuq@laptop.org>
-rwxr-xr-xgame.py26
1 files changed, 16 insertions, 10 deletions
diff --git a/game.py b/game.py
index d239014..7ef50ae 100755
--- a/game.py
+++ b/game.py
@@ -78,14 +78,19 @@ class TiltGame(object):
def __init__(self):
# Set up a clock for managing the frame rate.
self.clock = pygame.time.Clock()
- self.level = Level(0.5)
- ball_x, ball_y = self.level.get_ball_start()
- self.ball = Ball(ball_x, ball_y)
+
+ self._level = None
+ self._ball = None
self._running = False
self._paused = False
self._screen = None
+ def setup(self):
+ self._level = Level(0.5)
+ ball_x, ball_y = self._level.get_ball_start()
+ self._ball = Ball(ball_x, ball_y)
+
def set_paused(self, paused):
self._paused = paused
@@ -101,6 +106,7 @@ class TiltGame(object):
def run(self):
self._screen = pygame.display.get_surface()
+ self.setup()
self._running = True
while self._running:
@@ -117,24 +123,24 @@ class TiltGame(object):
# Move the ball
if not self._paused:
- if self.level.is_on_hole(self.ball.get_position()):
+ if self._level.is_on_hole(self._ball.get_position()):
# Success! Restart
- self.ball.set_position(*self.level.get_ball_start())
+ self._ball.set_position(*self._level.get_ball_start())
- if self.level.is_on_ground(self.ball.get_position()):
- self.ball.update()
+ if self._level.is_on_ground(self._ball.get_position()):
+ self._ball.update()
else:
# Fail! Restart
- self.ball.set_position(*self.level.get_ball_start())
+ self._ball.set_position(*self._level.get_ball_start())
# Clear Display
self._screen.fill(BACKGROUND_COLOR)
# Draw the level
- self.level.draw(self._screen)
+ self._level.draw(self._screen)
# Draw the ball
- self.ball.draw(self._screen)
+ self._ball.draw(self._screen)
# Flip Display
pygame.display.flip()