Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/model.py
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2007-07-28 10:10:04 (GMT)
committer Simon Schampijer <simon@schampijer.de>2007-07-28 10:10:04 (GMT)
commit4b4e99f99d257f279e02b87d4f41df66c2516c28 (patch)
treebd21232089075e187c3c1559982fa0a97794c9cd /model.py
parent61c71370348cadc2c3ec3abda314b29bd8f14684 (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
Diffstat (limited to 'model.py')
-rw-r--r--model.py12
1 files changed, 6 insertions, 6 deletions
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)