diff gamelib/tiles.py @ 303:e12d99215b74

Fix up data module unix-to-local path fixing. Fix similar problems in tile importing.
author Simon Cross <hodgestar@gmail.com>
date Sat, 05 Sep 2009 17:35:17 +0000
parents e694aa7731ed
children a8a7ada27fa2
line wrap: on
line diff
--- a/gamelib/tiles.py	Sat Sep 05 17:18:14 2009 +0000
+++ b/gamelib/tiles.py	Sat Sep 05 17:35:17 2009 +0000
@@ -2,6 +2,7 @@
 
 from pgu import tilevid, vid
 import os
+import data
 import imagecache
 
 class TileMap(object):
@@ -78,10 +79,12 @@
 
     def png_folder_load_tiles(self, path):
         """Load tiles from a folder of PNG files."""
-        for dirpath, dirnames, filenames in os.walk(path):
-            abstract_dirpath = "/".join(dirpath.split(os.path.sep))
+        full_path = data.filepath(path)
+        for dirpath, dirnames, filenames in os.walk(full_path):
+            relative_path = dirpath[len(full_path):]
+            relative_path = "/".join(relative_path.split(os.path.sep))
             for filename in filenames:
-                image_name = abstract_dirpath + "/" + filename
+                image_name = "/".join([path, relative_path, filename])
                 for tile_no in TILE_MAP.tiles_for_image(filename):
                     tile_name = TILE_MAP[tile_no]
                     self.tiles[tile_no] = FarmTile(tile_no, tile_name, image_name)