--- cfmaps/cfmap2png	2005/11/18 12:50:24	1.6
+++ cfmaps/cfmap2png	2005/11/20 01:31:21	1.10
@@ -1,7 +1,26 @@
 #!/opt/bin/perl
 
+# cfarch2png - convert crossfire maps to png+metadata
+# Copyright (C) 2005      Marc Lehmann <gvpe@schmorp.de>
+#
+# CFARCH2PNG is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with gvpe; if not, write to the Free Software
+# Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
 # tower of stars: missing craters?
 
+our $VERSION = '1.1';
+
 use strict;
 
 use Storable;
@@ -9,8 +28,6 @@
 
 use Gtk2;
 
-our $VERSION = '1.0';
-
 #init Gtk2::Gdk;
 
 my $LIB = $ENV{CROSSFIRE_LIBDIR}
@@ -175,20 +192,22 @@
 
    my ($mapx, $mapy);
 
-   my $map = $meta{map} = [];
+   my $map;
 
    for (@{ $mapa->{arch} }) {
+      my ($x, $y) = ($_->{x}, $_->{y});
+
       if ($_->{_name} eq "map") {
          $meta{info} = $_;
 
-         $mapx = $_->{width}  || $_->{x};
-         $mapy = $_->{height} || $_->{y};
+         $mapx = $_->{width}  || $x;
+         $mapy = $_->{height} || $y;
       } else {
-         push @{ $map->[$_->{x}][$_->{y}] }, $_;
+         push @{ $map->[$x][$y] }, $_;
 
          # arch map is unreliable w.r.t. width and height
-         $mapx = $_->{x} + 1 if $mapx <= $_->{x};
-         $mapy = $_->{y} + 1 if $mapy <= $_->{y};
+         $mapx = $x + 1 if $mapx <= $x;
+         $mapy = $y + 1 if $mapy <= $y;
          #$mapx = $a->{x} + 1, warn "$mapname: arch '$a->{_name}' outside map width at ($a->{x}|$a->{y})\n" if $mapx <= $a->{x};
          #$mapy = $a->{y} + 1, warn "$mapname: arch '$a->{_name}' outside map height at ($a->{x}|$a->{y})\n" if $mapy <= $a->{y};
       }
@@ -198,6 +217,7 @@
    $meta{height} = $mapy;
 
    my %draw_info;
+   my %map_info;
 
    # first pass, gather face stacking order, border and corner info
    for my $x (0 .. $mapx - 1) {
@@ -232,6 +252,13 @@
                # this is very ugly (some tiles are 32x33 or worse)
                my $bigface = $pb->get_width >= T*2 || $pb->get_height >= T*2;
 
+               my $dx = $bigface ? $o->{x} : 0;
+               my $dy = $bigface ? $o->{y} : 0;
+
+               push @{ $map_info{$level}{$mx, $my} }, $a;
+
+               $draw_info{$level}{$face}{$mx, $my} |= 0x2000 | (($dx + 128) << 24) | (($dy + 128) << 16);
+
                if (my $sface = $smooth->{$face}) {
                   $bigface and die "can't handle bigfaces with smoothing ($face)\n";
 
@@ -251,11 +278,6 @@
                   $draw_info{$smoothlevel}{$sface}{$mx + 1, $my - 1} |= 0x0800;
                }
 
-               my $dx = $bigface ? $o->{x} : 0;
-               my $dy = $bigface ? $o->{y} : 0;
-
-               $draw_info{$level}{$face}{$mx, $my} |= 0x2000 | (($dx + 128) << 24) | (($dy + 128) << 16);
-
                $o = $o->{more};
             }
          }
@@ -264,9 +286,9 @@
 
    my $map_pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, $mapx * T, $mapy * T
          or die;
-   $map_pb->fill (0x00000000);
+   $map_pb->fill (0xffffff00);
 
-   # second pass, render all the stuff
+   # second pass, render the map
    for my $level (sort { $a <=> $b } keys %draw_info) {
       my $v = $draw_info{$level};
       while (my ($sface, $info) = each %$v) {
@@ -323,6 +345,20 @@
       }
    }
 
+   # third pass, gather meta info
+   for my $level (sort { $a <=> $b } keys %map_info) {
+      my $info = $map_info{$level};
+
+         while (my ($xy, $as) = each %$info) {
+            my ($x, $y) = split $;, $xy;
+
+            next if $x < 0 || $x >= $mapx
+                 || $y < 0 || $y >= $mapy;
+
+            push @{ $meta{map}[$x][$y] }, $_ for @$as;
+         }
+   }
+
    ($map_pb, \%meta)
 }