changeset 20:43b2c4637eee

make the map borders black
author Radomir Dopieralski <sheep-devel@sheep.art.pl>
date Sun, 21 Aug 2011 23:28:07 +0200
parents 46e13b7784aa
children a1bf2955ec06
files level.png level.py
diffstat 2 files changed, 15 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
Binary file level.png has changed
--- a/level.py	Sun Aug 21 23:05:33 2011 +0200
+++ b/level.py	Sun Aug 21 23:28:07 2011 +0200
@@ -60,26 +60,30 @@
         y = self.y
         c = map[y][x]
         tileset = display.tiles[self.filename]
-        f = lambda x, y: map[y][x] == c
+        def f(x, y):
+            print x, y
+            print len(map[y]), len(map)
+            return map[y][x] == c
         def sides(x, y):
             if y < 0:
                 return 3
-            if x > 0 and f(x - 1, y):
-                if x < len(map[y]) - 1 and f(x + 1, y):
+            if x <= 0 or f(x - 1, y):
+                if x >= len(map[y])-1 or f(x + 1, y):
                     return 1
                 else:
                     return 2
-            elif x < len(map[y]) - 1 and f(x + 1, y):
+            elif x >= len(map[y])-1 or f(x + 1, y):
                 return 0
             return 3
-        if y > 0 and not f(x, y - 1) or y == 0:
+        if y > 0 and not f(x, y - 1):
             overlay = display.Overlay(x, y - 1, tileset[sides(x, y)][0])
             to_display.overlay.add(overlay)
-        if y < len(map) - 1 and f(x, y + 1):
-            tile = tileset[sides(x, y + 1)][1]
-        else:
-            tile = tileset[sides(x, y)][2]
-        to_display.background.blit(tile, (self.x * 24, self.y * 16))
+        if y < len(map) - 1:
+            if f(x, y + 1):
+                tile = tileset[sides(x, y + 1)][1]
+            else:
+                tile = tileset[sides(x, y)][2]
+            to_display.background.blit(tile, (self.x * 24, self.y * 16))
 
 
 class Level(object):
@@ -125,7 +129,7 @@
     def render(self, display):
         display.background = pygame.Surface((len(self.map[0]) * 24,
                                              len(self.map) * 16))
-        display.background.fill((16, 16, 16))
+        display.background.fill((0, 0, 0))
         self.flags = []
         for y, line in enumerate(self.map):
             self.flags.append([])