diff options
author | Sebastian Silva <icarito@sugarlabs.org> | 2011-03-04 08:39:05 (GMT) |
---|---|---|
committer | Sebastian Silva <icarito@sugarlabs.org> | 2011-03-04 08:39:05 (GMT) |
commit | 84cecb86534a8475fdb14c8021aa26193ffdfc96 (patch) | |
tree | 08c7ebfa841ca5ccff7384e84f5ea2ede5db2894 | |
parent | 3e8f7e01db973431e32b029902bf5719c436d60c (diff) |
Update repo to version 8 of activity
-rwxr-xr-x | Maze.activity/activity.py | 7 | ||||
-rw-r--r-- | Maze.activity/activity/activity.info | 2 | ||||
-rw-r--r-- | Maze.activity/game.py | 5 | ||||
-rw-r--r-- | Maze.activity/olpcgames/canvas.pyc | bin | 4410 -> 4585 bytes |
4 files changed, 5 insertions, 9 deletions
diff --git a/Maze.activity/activity.py b/Maze.activity/activity.py index dbf6940..ceb205c 100755 --- a/Maze.activity/activity.py +++ b/Maze.activity/activity.py @@ -1,9 +1,6 @@ import olpcgames -from gettext import gettext as _ - - class MazeActivity(olpcgames.PyGameActivity): - game_name = 'maze' - game_title = _('Maze') + game_name = 'game' + game_title = 'Maze' game_size = None # let olpcgames pick a nice size for us diff --git a/Maze.activity/activity/activity.info b/Maze.activity/activity/activity.info index 0c82055..c19b0ed 100644 --- a/Maze.activity/activity/activity.info +++ b/Maze.activity/activity/activity.info @@ -3,7 +3,7 @@ name = Maze bundle_id = vu.lux.olpc.Maze class = activity.MazeActivity icon = activity-maze -activity_version = 6 +activity_version = 8 show_launcher = yes host_version = 1 license = GPLv3+ diff --git a/Maze.activity/game.py b/Maze.activity/game.py index 692c136..9e0cb14 100644 --- a/Maze.activity/game.py +++ b/Maze.activity/game.py @@ -47,7 +47,6 @@ presenceService = presenceservice.get_instance() from maze import Maze from player import Player - class MazeGame: """Maze game controller. This class handles all of the game logic, event loop, mulitplayer, etc.""" @@ -306,10 +305,10 @@ class MazeGame: self.animate() self.draw() - pygame.display.update() + pygame.display.flip() # don't animate faster than about 20 frames per second # this keeps the speed reasonable and limits cpu usage - clock.tick(25) + clock.tick(20) def harder(self): """Make a new maze that is harder than the current one.""" diff --git a/Maze.activity/olpcgames/canvas.pyc b/Maze.activity/olpcgames/canvas.pyc Binary files differindex bda25d9..75c6c6a 100644 --- a/Maze.activity/olpcgames/canvas.pyc +++ b/Maze.activity/olpcgames/canvas.pyc |