--- Gtk2-GoBoard/GoBoard.pm	2008/06/25 19:35:47	1.8
+++ Gtk2-GoBoard/GoBoard.pm	2008/06/25 21:25:03	1.9
@@ -146,8 +146,8 @@
 sub load_images {
    $board_img    =       load_image "woodgrain-01.jpg";
    @black_img    =       load_image "b-01.png";
-   @white_img    = map +(load_image "w-0$_.png"), 1,2,3,4,5;
-   $shadow_img   =       load_image "shadow.png";
+   @white_img    = map +(load_image "w-0$_.png"), 1 .. 5;
+   $shadow_img   =       load_image "shadow.png"; # also used to fake hoshi points
    @triangle_img = map +(load_image "triangle-$_.png"), qw(b w);
    @square_img   = map +(load_image "square-$_.png"  ), qw(b w);
    @circle_img   = map +(load_image "circle-$_.png"  ), qw(b w);
@@ -449,8 +449,7 @@
 
          @area  = ($kx[$x] - $ofs, $ky[$y] - $ofs,
                       $edge + $shadow, $edge + $shadow);
-         @areai = ((ceil $area[0]), (ceil $area[1]),
-                      (int $area[2]), (int $area[3])); # area, integer
+         @areai = map +(ceil $_), @area; # area, integer
          
          $pb = new_pixbuf @areai[2,3];
          $self->{backgroundpb}->copy_area (@areai, $pb, 0, 0);
@@ -498,12 +497,12 @@
    my $shadow = $size * SHADOW;
 
    for my $stone ($mark & MARK_W ? @white_img : @black_img) {
-      my $base = new_pixbuf +(ceil $size + $shadow) x2, 1, 0x00000000;
+      my $base = new_pixbuf +(ceil $csize + $shadow) x2, 1, 0x00000000;
 
       # zeroeth the shadow
       if (~$mark & MARK_GRAYED and $mark & (MARK_B | MARK_W)) {
          $shadow_img->composite (
-            $base, $shadow, $shadow, $csize, $csize, $shadow, $shadow,
+            $base,  ($shadow) x2, $csize, $csize, ($shadow) x2,
             $size / $shadow_img->get_width, $size / $shadow_img->get_height,
             'bilinear', 128
          );
@@ -514,7 +513,7 @@
          my ($mask, $alpha, $scale) = @$_;
          if ($mark & $mask) {
             $stone->composite (
-               $base, 0, 0, $csize, $csize, ($size * (1 - $scale) * 0.5 ) x2,
+               $base, 0, 0, $csize, $csize, ($size * (1 - $scale) * 0.5) x2,
                $size * $scale / $stone->get_width, $size * $scale / $stone->get_height,
                'bilinear', $alpha
             );
@@ -527,25 +526,25 @@
          my ($mask, $img) = @$_;
          if ($mark & $mask) {
             $img->composite (
-               $base, (int $size / 4) x2, (ceil $size / 2 + 1) x2, ($size / 4) x2,
+               $base, ($size / 4) x2, (ceil $size / 2 + 1) x2, ($size / 4) x2,
                $size / $img->get_width / 2, $size / $img->get_height / 2,
                'bilinear', 255
             );
          }
       }
 
-      # and lastly any markers
+      # and finally any markers
       my $dark_bg = ! ! ($mark & MARK_B);
 
-      for ([MARK_CIRCLE,   $circle_img[$dark_bg]],
+      for ([MARK_CIRCLE,   $circle_img  [$dark_bg]],
            [MARK_TRIANGLE, $triangle_img[$dark_bg]],
-           [MARK_CROSS,    $cross_img[$dark_bg]],
-           [MARK_SQUARE,   $square_img[$dark_bg]],
-           [MARK_KO,       $square_img[$dark_bg]]) {
+           [MARK_CROSS,    $cross_img   [$dark_bg]],
+           [MARK_SQUARE,   $square_img  [$dark_bg]],
+           [MARK_KO,       $square_img  [$dark_bg]]) {
         my ($mask, $img) = @$_;
         if ($mark & $mask) {
            $img->composite (
-              $base, 0, 0, $size, $size, 0, 0,
+              $base, 0, 0, $csize, $csize, 0, 0,
               $size / $img->get_width, $size / $img->get_height,
               'bilinear', $dark_bg ? 176 : 190
            );