diff options
author | Gonzalo Odiard <godiard@gmail.com> | 2014-06-12 20:15:48 (GMT) |
---|---|---|
committer | Gonzalo Odiard <godiard@gmail.com> | 2014-06-16 15:26:38 (GMT) |
commit | 1773ba4db0ea2ac58ac3a0be2dcb6ebcf7f51cd5 (patch) | |
tree | 1cebd761a0e10a271bc4fdc5174a351f0a9b8d28 | |
parent | 771abfb9ec021e6fd120cb01eab394f5cbfa80f5 (diff) |
Move presenservice code to the activity class
-rwxr-xr-x | activity.py | 8 | ||||
-rw-r--r-- | game.py | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/activity.py b/activity.py index 8d0879d..6bcbaf1 100755 --- a/activity.py +++ b/activity.py @@ -29,17 +29,17 @@ class MazeActivity(activity.Activity): self.build_toolbar() + self.pservice = PresenceService() + self.owner = self.pservice.get_owner() + state = None if 'state' in self.metadata: state = json.loads(self.metadata['state']) - self.game = game.MazeGame(self, state) + self.game = game.MazeGame(self, self.owner, state) self.set_canvas(self.game) self.game.show() self.connect("key_press_event", self.game.key_press_cb) - self.pservice = PresenceService() - self.owner = self.pservice.get_owner() - self.text_channel = None self.my_key = profile.get_pubkey() self._alert = None @@ -33,14 +33,11 @@ from gi.repository import GObject import logging from gettext import gettext as _ -from sugar3.presence import presenceservice from sugar3.graphics import style from sugar3.graphics.icon import Icon from sugar3.graphics.xocolor import XoColor from sugar3.graphics.toolbutton import ToolButton -presenceService = presenceservice.get_instance() - from maze import Maze, Rectangle from player import Player import sensors @@ -57,7 +54,7 @@ class MazeGame(Gtk.DrawingArea): GOAL_COLOR = (0x00, 0xff, 0x00) WIN_COLOR = (0xff, 0xff, 0x00) - def __init__(self, activity, state=None): + def __init__(self, activity, owner, state=None): super(MazeGame, self).__init__() # note what time it was when we first launched self.game_start_time = time.time() @@ -65,12 +62,11 @@ class MazeGame(Gtk.DrawingArea): # the activity is used to communicate with other players self._activity = activity - xoOwner = presenceService.get_owner() # keep a list of all local players self.localplayers = [] # start with just one player - player = Player(xoOwner) + player = Player(owner) self.localplayers.append(player) # plus some bonus players (all hidden to start with) self.localplayers.extend(player.bonusPlayers()) |