--- a/gamelib/data.py	Sat Sep 05 17:18:14 2009 +0000
+++ b/gamelib/data.py	Sat Sep 05 17:35:17 2009 +0000
@@ -10,10 +10,15 @@
 data_py = os.path.abspath(os.path.dirname(__file__))
 data_dir = os.path.normpath(os.path.join(data_py, '..', 'data'))
 
+def unix_to_local(filename):
+    '''Convert a relative unix / http filename to a local one.'''
+    return os.path.join(*filename.split("/"))
+
 def filepath(*filenames):
     '''Determine the path to a file in the data directory.
     '''
-    return os.path.join(data_dir, *filenames)
+    os_filenames = [unix_to_local(f) for f in filenames]
+    return os.path.join(data_dir, *os_filenames)
 
 def load(filename, mode='rb'):
     '''Open a file in the data directory.
@@ -21,6 +26,6 @@
     "mode" is passed as the second arg to open().
     '''
     # convert unix path separator to platform appropriate one
-    filename = os.path.join(*filename.split("/"))
+    filename = unix_to_local(filename)
     return open(os.path.join(data_dir, filename), mode)
 

--- a/gamelib/gameboard.py	Sat Sep 05 17:18:14 2009 +0000
+++ b/gamelib/gameboard.py	Sat Sep 05 17:35:17 2009 +0000
@@ -307,7 +307,7 @@
     def __init__(self, main_app):
         self.disp = main_app
         self.tv = tiles.FarmVid()
-        self.tv.png_folder_load_tiles(data.filepath('tiles'))
+        self.tv.png_folder_load_tiles('tiles')
         self.tv.tga_load_level(data.filepath('levels/farm.tga'))
         self.create_display()
 

--- 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)