Make GenericBits even more generic.

[naja.git] / naja / widgets / tile.py

diff --git a/naja/widgets/tile.py b/naja/widgets/tile.py
index 8ccb99db2671c5efdde8f0ba1de4dd7926cfdbb7..9e8fe8508056dae9bc61a4e93ccd547c772514d9 100644 (file)
--- a/naja/widgets/tile.py
+++ b/naja/widgets/tile.py
@@ -94,7 +94,7 @@ class TileWidget(Widget):
         self.surface.blit(img, (TILE_SIZE[0] - 20, 0))
 
     def _prepare_lock(self, action, y_offset):
-        if not action.required_bits:
+        if action.required_bits not in BIT_MAP:
             return 4
 
         img_name = BIT_MAP[action.required_bits]
@@ -117,13 +117,13 @@ class TileWidget(Widget):
     def _prepare_action(self, action, y_offset):
         x_offset = self._prepare_lock(action, y_offset)
         if self.board_pos != self.state.player.position:
-            for glyph in action.GLYPHS:
+            for glyph in action.get_glyphs():
                 img = resources.get_image(glyph, transforms=(EIGHT_BIT,))
                 self.surface.blit(img, (x_offset, y_offset + 4))
                 x_offset += img.get_width()
-            if action.MSB_GLYPH is not None:
+            if action.get_msb_glyph() is not None:
                 img = resources.get_image(
-                    action.MSB_GLYPH,
+                    action.get_msb_glyph(),
                     transforms=(EIGHT_BIT, blender(PALETTE.LIGHT_VIOLET)))
                 self.surface.blit(img, (x_offset, y_offset + 4))
                 x_offset += img.get_width()