From: Jeremy Thurgood <firxen@gmail.com>
Date: Thu, 15 May 2014 17:11:33 +0000 (+0200)
Subject: Merge branch 'master' into No_movement_mode
X-Git-Tag: 0.1~284
X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=0cef06f581d48315a59a19ac06ca1d2be14cbb4c;hp=0bd160dc700e55e996a1ad89e9daf6cdc00c88d8;p=naja.git

Merge branch 'master' into No_movement_mode
---

diff --git a/data/images/board/tile_selected.png b/data/images/board/tile_selected.png
index 250ab12..4622c84 100644
Binary files a/data/images/board/tile_selected.png and b/data/images/board/tile_selected.png differ
diff --git a/naja/widgets/tile.py b/naja/widgets/tile.py
index e559d95..36b73d0 100644
--- a/naja/widgets/tile.py
+++ b/naja/widgets/tile.py
@@ -40,11 +40,14 @@ class TileWidget(Widget):
         else:
             bg = resources.get_image('board/tile_1.png',
                                      transforms=(EIGHT_BIT,))
+        overlay = None
         if self.highlighted:
-            bg = resources.get_image('board/tile_selected.png',
-                                     transforms=(EIGHT_BIT,))
+            overlay = resources.get_image('board/tile_selected.png',
+                                          transforms=(EIGHT_BIT,))
         self.surface = pygame.surface.Surface(TILE_SIZE)
         self.surface.blit(bg, (0, 0))
+        if overlay is not None:
+            self.surface.blit(overlay, (0, 0))
         # Look up the required bits on the board location
         card = self.state.board_locations[self.board_pos]
         player_pos = self.state.player.position
diff --git a/sources/images/square.xcf b/sources/images/square.xcf
index eb62976..88e66bc 100644
Binary files a/sources/images/square.xcf and b/sources/images/square.xcf differ