X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Ftile.py;h=b199418e7f12a33481fef3cd893e119a4d7311e2;hb=266021313a1501c86c11c803851c2b4bb50a8c00;hp=93078a586df3cc90adc1327e59bafd5dff5ac22b;hpb=0dfef62c2ebdab980497ca8c26bc3228f47b9069;p=naja.git

diff --git a/naja/widgets/tile.py b/naja/widgets/tile.py
index 93078a5..b199418 100644
--- a/naja/widgets/tile.py
+++ b/naja/widgets/tile.py
@@ -2,7 +2,8 @@
 import pygame
 
 from naja.constants import (
-    TILE_SIZE, BITS, LOCK_HEIGHT, EXAMINE, ACTION_GLYPHS, PALETTE)
+    TILE_SIZE, BITS, LOCK_HEIGHT, SMALL_LOCK_HEIGHT, EXAMINE, ACTION_GLYPHS,
+    PALETTE)
 from naja.resources import resources
 from naja.resources.mutators import EIGHT_BIT, blender
 from naja.widgets.base import Widget
@@ -58,10 +59,10 @@ class TileWidget(Widget):
 
         if self.state.gameboard.player_mode == EXAMINE and legal_move:
             overlays.append(resources.get_image('board/tile_available.png',
-                                     transforms=(EIGHT_BIT,)))
+                                                transforms=(EIGHT_BIT,)))
         if self.highlighted:
             overlays.append(resources.get_image('board/tile_selected.png',
-                                          transforms=(EIGHT_BIT,)))
+                                                transforms=(EIGHT_BIT,)))
 
         self.surface = pygame.surface.Surface(TILE_SIZE)
         self.surface.blit(bg, (0, 0))
@@ -78,11 +79,18 @@ class TileWidget(Widget):
             return 4
 
         img_name = BIT_MAP[action.required_bits]
+
         if self.board_pos != self.state.player.position:
             x_offset = 0
         else:
             img_name = img_name.replace('.png', '_small.png')
-            x_offset = 4
+            x_offset = 2
+            if y_offset == LOCK_HEIGHT:
+                y_offset = 0  # middle -> top
+            elif y_offset == 2 * LOCK_HEIGHT:
+                # bottom -> further down
+                y_offset += LOCK_HEIGHT - SMALL_LOCK_HEIGHT - 2
+
         img = resources.get_image(img_name, transforms=(EIGHT_BIT,))
         self.surface.blit(img, (x_offset, y_offset))
         return x_offset + img.get_width() + 2