Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS4
-rwxr-xr-xcardtable.py2
-rwxr-xr-xgame.py2
-rw-r--r--model.py12
4 files changed, 12 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index cd34b45..1948559 100644
--- a/NEWS
+++ b/NEWS
@@ -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 = {}
diff --git a/game.py b/game.py
index 30fdae7..cc91891 100755
--- a/game.py
+++ b/game.py
@@ -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
diff --git a/model.py b/model.py
index f829ab4..224daa6 100644
--- a/model.py
+++ b/model.py
@@ -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)