Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/game.py
diff options
context:
space:
mode:
Diffstat (limited to 'game.py')
-rwxr-xr-x[-rw-r--r--]game.py21
1 files changed, 8 insertions, 13 deletions
diff --git a/game.py b/game.py
index f379223..c6bf8ba 100644..100755
--- a/game.py
+++ b/game.py
@@ -23,20 +23,14 @@
import sys
-import os
import time
import pygame
-import olpcgames
-import olpcgames.pausescreen as pausescreen
import olpcgames.mesh as mesh
-import olpcgames.svgsprite as svgsprite
-from pygame import sprite as sprite
-from olpcgames.util import get_bundle_path
from sugar.presence import presenceservice
-bundlepath = get_bundle_path()
+
presenceService = presenceservice.get_instance()
from maze import Maze
@@ -68,6 +62,7 @@ class PacmanGame:
def __init__(self, screen):
print "init"
+ pygame.init()
# note what time it was when we first launched
self.game_start_time = time.time()
self.pause = 0
@@ -149,7 +144,7 @@ class PacmanGame:
# clear and mark the whole screen as dirty
self.screen.fill((0,0,0))
- self.markRectDirty(pygame.Rect(0,0,99999,99999))
+ self.markRectDirty(pygame.Rect(0,0,1200,900))
def markRectDirty(self, rect):
"""Mark an area that needs to be redrawn. This lets us
@@ -242,8 +237,8 @@ class PacmanGame:
print "Error handling message: %s\n%s" % (event, sys.exc_info())
else:
print "Message from unknown buddy?"
- else:
- print "Unknown event:", event
+ """else:
+ print "Unknown event:", event"""
def handleMessage(self, player, message):
"""Handle a message from a player on the mesh.
@@ -306,7 +301,7 @@ class PacmanGame:
def togglePause(self):
if (self.pause == 1):
self.pause = 0
- self.markRectDirty(pygame.Rect(0,0,99999,99999)) # repaint
+ self.markRectDirty(pygame.Rect(0,0,1200,900)) # repaint
else:
self.pause = 1
@@ -321,7 +316,7 @@ class PacmanGame:
if (self.pause == 0):
self.frame += 1
# process all queued events
- for event in pausescreen.get_events(sleep_timeout=30):
+ for event in pygame.event.get():
self.processEvent(event)
if (self.pause == 0):
@@ -375,7 +370,7 @@ class PacmanGame:
# stop game
self.togglePause ()
# repaint
- self.markRectDirty(pygame.Rect(0,0,99999,99999))
+ self.markRectDirty(pygame.Rect(0,0,1200,900))
self.checkGhostPositions () # checks if player runs into ghost