diff options
author | Simon Schampijer <simon@schampijer.de> | 2007-07-28 10:10:04 (GMT) |
---|---|---|
committer | Simon Schampijer <simon@schampijer.de> | 2007-07-28 10:10:04 (GMT) |
commit | 4b4e99f99d257f279e02b87d4f41df66c2516c28 (patch) | |
tree | bd21232089075e187c3c1559982fa0a97794c9cd | |
parent | 61c71370348cadc2c3ec3abda314b29bd8f14684 (diff) |
Removed absolute path of images and sounds
Removed absolute path for game icons and sounds
which was cauing problems when a game is shared between
an XO and a sugar-jhbuild emulator
-rw-r--r-- | NEWS | 4 | ||||
-rwxr-xr-x | cardtable.py | 2 | ||||
-rwxr-xr-x | game.py | 2 | ||||
-rw-r--r-- | model.py | 12 |
4 files changed, 12 insertions, 8 deletions
@@ -1,3 +1,7 @@ +* Removed absolute path for game icons and sounds +which was cauing problems when a game is shared between +an XO and a sugar-jhbuild emulator (erikos) + * Free the audio device when not in focus (erikos) * Memorize now uses the ogg vorbis format to play sounds diff --git a/cardtable.py b/cardtable.py index 11bf1b5..e61b6f0 100755 --- a/cardtable.py +++ b/cardtable.py @@ -78,7 +78,7 @@ class CardTable(gtk.EventBox): for card in self.cards_data: if card.get('img', None): - jpg = card['img'] + jpg = os.path.join(os.path.dirname(__file__), card['img']) else: jpg = None props = {} @@ -147,7 +147,7 @@ class MemorizeGame(gobject.GObject): if self.sound == 1: snd = self.model.grid[id].get('snd', None) if snd != None: - self.cs.perform('i 108 0.0 3.0 "%s" 1 0.9 0'%(snd)) + self.cs.perform('i 108 0.0 3.0 "%s" 1 0.9 0'%(os.path.join(os.path.dirname(__file__), snd))) _logger.debug('Audio: play sound=%s'%snd) # First card case @@ -86,7 +86,7 @@ class Model(object): self.data = {} self.dtdpath = dtdpath if gamespath == None: - self._GAMES_PATH = os.path.join(os.path.dirname(__file__), 'games') + self._GAMES_PATH = 'games' else: if os.path.isdir(gamespath) is False: os.makedirs(gamespath) @@ -121,7 +121,7 @@ class Model(object): self.pairs = {} try: - doc = libxml2.parseFile(os.path.join(self.data['path'], gamename+'.mem')) + doc = libxml2.parseFile(os.path.join(os.path.dirname(__file__), os.path.join(self.data['path'], gamename+'.mem'))) if doc.validateDtd(self.ctxt, self.dtd): # get the requested nodes @@ -254,8 +254,8 @@ class Model(object): if self.pairs[key].props.aimg != None: elem['img'] = os.path.join(self.data['pathimg'], self.pairs[key].props.aimg) if self.pairs[key].props.asnd != None: - if os.path.isfile(os.path.join(self.data['pathsnd'], self.pairs[key].props.asnd)): - elem['snd'] = os.path.join(self.data['pathsnd'], self.pairs[key].props.asnd) + #if os.path.isfile(os.path.join(self.data['pathsnd'], self.pairs[key].props.asnd)): + elem['snd'] = os.path.join(self.data['pathsnd'], self.pairs[key].props.asnd) if self.pairs[key].props.achar != None: elem['char'] = self.pairs[key].props.achar temp1.append(elem) @@ -267,8 +267,8 @@ class Model(object): if self.pairs[key].props.bimg != None: elem['img'] = os.path.join(self.data['pathimg'], self.pairs[key].props.bimg) if self.pairs[key].props.bsnd != None: - if os.path.isfile(os.path.join(self.data['pathsnd'], self.pairs[key].props.bsnd)): - elem['snd'] = os.path.join(self.data['pathsnd'], self.pairs[key].props.bsnd) + #if os.path.isfile(os.path.join(self.data['pathsnd'], self.pairs[key].props.bsnd)): + elem['snd'] = os.path.join(self.data['pathsnd'], self.pairs[key].props.bsnd) if self.pairs[key].props.bchar != None: elem['char'] = self.pairs[key].props.bchar temp2.append(elem) |