changeset 205:2b5956bedf64

Set colour of default new segment to colour of snake head.
author Simon Cross <hodgestar@gmail.com>
date Wed, 14 Sep 2011 20:36:09 +0200
parents 514ae531eccf
children bf661acd34ee
files mamba/snake.py mamba/sprites.py
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mamba/snake.py	Wed Sep 14 20:32:58 2011 +0200
+++ b/mamba/snake.py	Wed Sep 14 20:36:09 2011 +0200
@@ -34,6 +34,7 @@
     def add_segment(self, segment=None):
         if segment is None:
             segment = Body((0, 0))
+            segment.set_colour(self.head.colour)
         self.pending_segments.append(segment)
 
     def remove_segment(self, segment=None):
@@ -121,7 +122,7 @@
     def __init__(self, image_name, tile_pos):
         super(Segment, self).__init__()
         self.set_base_image(image_name)
-        self._colour_overlay = self.GREEN
+        self.colour = self.GREEN
         self.orientation = UP
 
         self.make_images()
@@ -149,7 +150,7 @@
             (UP, (mutators.UP,)),
             (DOWN, (mutators.DOWN,)),
             ]:
-            all_muts = (self._colour_overlay,) + self._detail_mutators + muts
+            all_muts = (self.colour,) + self._detail_mutators + muts
             self._images[orientation] = self.load_image(self._base_image,
                     all_muts)
 
@@ -161,7 +162,7 @@
         self.update_image()
 
     def set_colour(self, colour_overlay):
-        self._colour_overlay = colour_overlay
+        self.colour = colour_overlay
         self.make_images()
         self.update_image()
 
--- a/mamba/sprites.py	Wed Sep 14 20:32:58 2011 +0200
+++ b/mamba/sprites.py	Wed Sep 14 20:36:09 2011 +0200
@@ -155,7 +155,7 @@
             *colour_with_fittings("door", self.tileset, colour))
 
     def get_solid(self, snake, segment):
-        return COLOURS[self.colour] != segment._colour_overlay
+        return COLOURS[self.colour] != segment.colour
 
 
 class EntrySprite(SingleImageTileSprite):