--- a/src/gfx.cpp	Mon Aug 11 22:58:30 2008 +0000
+++ b/src/gfx.cpp	Tue Aug 12 02:20:39 2008 +0000
@@ -1011,8 +1011,9 @@
 	 * A few more for the DOS palette, because the water colors are
 	 * 245-254 for DOS and 217-226 for Windows.  */
 	const ExtraPaletteValues *ev = &_extra_palette_values;
-	int c = _use_dos_palette ? PALETTE_ANIM_SIZE_DOS : PALETTE_ANIM_SIZE_WIN;
+	const int colour_rotation_amount = _use_dos_palette ? PALETTE_ANIM_SIZE_DOS : PALETTE_ANIM_SIZE_WIN;
 	Colour old_val[PALETTE_ANIM_SIZE_DOS];
+	const int oldval_size = colour_rotation_amount * sizeof(*old_val);
 	uint i;
 	uint j;
 	uint old_tc = _palette_animation_counter;
@@ -1024,7 +1025,7 @@
 	Colour *palette_pos = &_cur_palette[PALETTE_ANIM_SIZE_START];  // Points to where animations are taking place on the palette
 	/* Makes a copy of the current anmation palette in old_val,
 	 * so the work on the current palette could be compared, see if there has been any changes */
-	memcpy(old_val, palette_pos, c * sizeof(*old_val));
+	memcpy(old_val, palette_pos, oldval_size);
 
 	/* Dark blue water */
 	s = (_settings_game.game_creation.landscape == LT_TOYLAND) ? ev->dark_water_TOY : ev->dark_water;
@@ -1118,10 +1119,10 @@
 	if (blitter != NULL && blitter->UsePaletteAnimation() == Blitter::PALETTE_ANIMATION_NONE) {
 		_palette_animation_counter = old_tc;
 	} else {
-		if (memcmp(old_val, &_cur_palette[PALETTE_ANIM_SIZE_START], c * sizeof(*old_val)) != 0) {
+		if (memcmp(old_val, &_cur_palette[PALETTE_ANIM_SIZE_START], oldval_size) != 0) {
 			/* Did we changed anything on the palette? Seems so.  Mark it as dirty */
 			_pal_first_dirty = PALETTE_ANIM_SIZE_START;
-			_pal_count_dirty = c;
+			_pal_count_dirty = colour_rotation_amount;
 		}
 	}
 }