[ViewVC] Diff of: cvs/cfmaps/cfmap2html

Comparing cfmaps/cfmap2html (file contents):
Revision 1.23 by root, Wed Feb 14 02:33:47 2007 UTC vs.
Revision 1.29 by root, Thu Jun 21 12:30:10 2007 UTC

 # 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
+# along with cfmaps; if not, write to the Free Software
 # Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-our $VERSION = '1.212';
+our $VERSION = '2.001';
-use Storable;
+use Crossfire 1.0;
-my $LIBDIR = $ENV{CROSSFIRE_LIBDIR}
-   or die "\$CROSSFIRE_LIBDIR must be set\n";
 my $T = 32;
 my $arch;
    local $_ = shift;
    s/([<>&])/sprintf "&#%d;", ord $1/ge;
    $_
 }
+my @cfmap2png;
 for my $path (@ARGV) {
+   (my $base = $path) =~ s/\.map//;
 #   print STDERR "$path\n";
-   if (!-e "$path.png"
+   if (!-e "$base.png"
-       || !-e "$path.pst"
-       || -M "$path.pst" > -M $path
-       || -M "$path.png" > -M $path) {
+       || -M "$base.png" > -M "$base.map") {
       # regenerate png and metainfo
-      system "cfmap2png", $path;
+      push @cfmap2png, $path;
    };
-   $arch ||= Storable::retrieve "$LIBDIR/archetypes.pst";
-   my $meta = Storable::retrieve "$path.pst";
-   open my $fh, ">:utf8", "$path.xhtml"
-      or die "$path.xhtml: $!";
-   select $fh;
-   my $W = $meta->{width}  * $T;
-   my $H = $meta->{height} * $T;
-   my $W2 = $W + 600;
-   my (@path) = split /\//, $path;
-   print "<?xml version='1.0' encoding='utf-8'?>",
-         '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
-         "<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en'>",
-         "<head>",
-            "<title>Crossfire Map \"$path\"</title>",
-            "<link rel='stylesheet' type='text/css' media='all' href='/common.css'/>\n",
-            "<link rel='stylesheet' type='text/css' media='all' href='/overlay.css' title='Show Overlays'/>\n",
-            "<link rel='alternate stylesheet' type='text/css' media='all' href='/plain.css' title='Hide Overlays'/>\n",
-            "<style type='text/css'>\n",
-            ".map { width: ${W}px; height: ${H}px; background-image: url($path[-1].png); }\n",
-            ".enlarge { width: ${W2}px; height: 600px; }\n",
-            "</style>",
-         "</head>",
-         "<body>";
-   print "<table class='nav'>",
-         "<tr class='center'><td class='title' rowspan='3'>",
-         "Crossfire Map<br/>",
-         "<span class='big'>";
-   print "<a href='/'>/</a> ";
-   for (0 .. $#path - 1) {
-      print "<a href='/", (join "/", @path[0..$_]), "/'>$path[$_]</a> / ";
-   }
-   my @dir = qw(none up right down left);
-   my @tile = map {
-      $meta->{info}{"tile_path_$_"}
-         ? "<a href='$meta->{info}{\"tile_path_$_\"}.xhtml'><img class='tile' src='$meta->{info}{\"tile_path_$_\"}.jpg' alt='$dir[$_]'/></a>"
-         : ""
-   } 1..4;
-   #"}"# vim misparses without this comment
-   print "$path[-1]",
-         "</span>",
-         "<p class='about'><a href='/about.txt'>[more about cfmaps.schmorp.de]</a></p>",
-         "</td>",
-         "<td/><td>$tile[0]</td><td/></tr>",
-         "<tr><td>$tile[3]</td>",
-         "<td><img class='thumb' src='@path[-1].jpg' width='$meta->{width}' height='$meta->{height}' alt='map thumbnail'/></td>",
-         "<td>$tile[1]</td></tr>",
-         "<tr><td/><td>$tile[2]</td><td/></tr>",
-         "</table>";
-   my $W1 = $W + 600;
-   print "<p class='m'>",
-            escape_html $meta->{info}{msg},
-         "</p>";
-   print "<table class='map'>";
-   my %ignore = map +($_ => 1), qw(name _name x y);
-   my %is_exit = map +($_ => 1), 41, 57, 66;
-   for my $y (0.. $meta->{height} - 1) {
-      print "<tr>";
-      for my $x (0.. $meta->{width} - 1) {
-          if (my $as = $meta->{map}[$x][$y]) {
-             my @class;
-             push @class, "fishy"  if grep $_->{invisible} || $_->{face} || exists $_->{no_pass} || exists $_->{no_pick}, @$as;
-             push @class, "exit"   if grep $is_exit{$arch->{$_->{_name}}{type}} && $_->{slaying}, @$as;
-             push @class, "dialog" if grep $_->{msg} =~ /^\@match/m, @$as;
-             print "<td", (@class ? " class='" . (join " ", @class) . "'" : ""), ">";
-             print "<div>";
-             print join "\n", map "<span class='c'>$_</span>",
-                reverse sort { (length $a) <=> (length $b) or $b <=> $a }
-                   grep $_, map $_->{connected}, @$as;
-             print "<div>($x|$y)";
-             sub print_archs {
-                print "<ul>";
-                for my $a (@{$_[0]}) {
-                   my $o = $arch->{$a->{_name}};
-                   my $type = $a->{type} || $o->{type};
-                   my $aname = escape_html $a->{_name};
-                   my $name = escape_html $a->{name} || $o->{name};
-                   print "<li><a href='/a/$a->{_name}'>$aname \"$name\"</a>\n";
-                   for (sort keys %$a) {
-                      next if $ignore{$_};
-                      my $v = escape_html $a->{$_};
-                      if ($_ eq "slaying" && $is_exit{$type}) { # door, teleporter, player_changer
-                         $a->{msg} =~ /^final_map\s*(\S+)\s*$/m, $v = $1
-                            if $v eq "/!"; # random map
-                         print "slaying => <a href='$v.xhtml'>$v</a>\n";
-                      } elsif ($_ eq "other_arch") {
-                         print "$_ => <a href='/a/$a->{$_}'>$v</a>\n";
-                      } elsif ($_ eq "inventory") {
-                         print "inventory =>\n";
-                         print_archs ($a->{$_});
-                      } elsif ($_ eq "msg") {
-                         print "<p class='m'>$v</p>";
-                      } else {
-                         print "$_ => $v\n";
-                      }
-                   }
-                   print "</li>";
-                }
-                print "</ul>";
-             }
-             print_archs $as;
-             print "</div></div></td>";
-          } else {
-             print "<td/>";
-          }
-      }
-      print "</tr>";
-   }
-   print "</table><p class='footer'>created by <a href='http://software.schmorp.de/pkg/cfmaps'>cfmap2html</a> version $VERSION</p>",
-         "<p class='enlarge'/></body></html>";
-   close $fh;
-   #system "gzip", "-7f", "$path.xhtml";
 }
+system "cfmap2png", @cfmap2png
+   if @cfmap2png;
+for my $path (@ARGV) {
+   (my $base = $path) =~ s/\.map//;
+   if (!-e "$base.xhtml"
+       || -M "$base.xhtml" > -M "$base.map") {
+      Crossfire::load_archetypes
+         unless %ARCH;
+      my $meta = read_arch "$base.map";
+      open my $fh, ">:utf8", "$base.xhtml"
+         or die "$base.xhtml: $!";
+      select $fh;
+      my $W = $meta->{width}  * $T;
+      my $H = $meta->{height} * $T;
+      my $W2 = $W + 600;
+      my (@path) = split /\//, $base;
+      print "<?xml version='1.0' encoding='utf-8'?>",
+            '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
+            "<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en'>",
+            "<head>",
+               "<title>Crossfire Map \"$path\"</title>",
+               "<link rel='stylesheet' type='text/css' media='all' href='/common.css'/>\n",
+               "<link rel='stylesheet' type='text/css' media='all' href='/overlay.css' title='Show Overlays'/>\n",
+               "<link rel='alternate stylesheet' type='text/css' media='all' href='/plain.css' title='Hide Overlays'/>\n",
+               "<style type='text/css'>\n",
+               ".map { width: ${W}px; height: ${H}px; background-image: url($path[-1].png); }\n",
+               ".enlarge { width: ${W2}px; height: 600px; }\n",
+               "</style>",
+            "</head>",
+            "<body>";
+      print "<table class='nav'>",
+            "<tr class='center'><td class='title' rowspan='3'>",
+            "Crossfire Map<br/>",
+            "<span class='big'>";
+      print "<a href='/'>/</a> ";
+      for (0 .. $#path - 1) {
+         print "<a href='/", (join "/", @path[0..$_]), "/'>$path[$_]</a> / ";
+      }
+      my @dir = qw(none up right down left);
+      my @tile = map {
+         $meta->{info}{"tile_path_$_"}
+            ? "<a href='$meta->{info}{\"tile_path_$_\"}.xhtml'><img class='tile' src='$meta->{info}{\"tile_path_$_\"}.jpg' alt='$dir[$_]'/></a>"
+            : ""
+      } 1..4;
+      #"}"# vim misparses without this comment
+      print "$path[-1]",
+            "</span>",
+            "<p class='about'><a href='/about.txt'>[more about cfmaps.schmorp.de]</a></p>",
+            "</td>",
+            "<td/><td>$tile[0]</td><td/></tr>",
+            "<tr><td>$tile[3]</td>",
+            "<td><img class='thumb' src='@path[-1].jpg' width='$meta->{width}' height='$meta->{height}' alt='map thumbnail'/></td>",
+            "<td>$tile[1]</td></tr>",
+            "<tr><td/><td>$tile[2]</td><td/></tr>",
+            "</table>";
+      my $W1 = $W + 600;
+      print "<p class='m'>",
+               escape_html $meta->{info}{msg},
+            "</p>";
+      print "<table class='map'>";
+      my %ignore = map +($_ => 1), qw(name _name _atype x y);
+      my %is_exit = map +($_ => 1), 41, 57, 66;
+      for my $y (0.. $meta->{height} - 1) {
+         print "<tr>";
+         for my $x (0.. $meta->{width} - 1) {
+             if (my $as = $meta->{map}[$x][$y]) {
+                my @class;
+                push @class, "fishy"  if grep $_->{invisible} || $_->{face} || exists $_->{no_pass} || exists $_->{no_pick}, @$as;
+                push @class, "exit"   if grep $is_exit{$arch->{$_->{_name}}{type}} && $_->{slaying}, @$as;
+                push @class, "dialog" if grep $_->{msg} =~ /^\@match/m, @$as;
+                print "<td", (@class ? " class='" . (join " ", @class) . "'" : ""), ">";
+                print "<div>";
+                print join "\n", map "<span class='c'>$_</span>",
+                   reverse sort { (length $a) <=> (length $b) or $b <=> $a }
+                      grep $_, map $_->{connected}, @$as;
+                print "<div>($x|$y)";
+                sub print_archs {
+                   print "<ul>";
+                   for my $a (@{$_[0]}) {
+                      my $o = $arch->{$a->{_name}};
+                      my $type = $a->{type} || $o->{type};
+                      my $aname = escape_html $a->{_name};
+                      my $name = escape_html $a->{name} || $o->{name};
+                      print "<li><a href='/a/$a->{_name}'>$aname \"$name\"</a>\n";
+                      for (sort keys %$a) {
+                         next if $ignore{$_};
+                         my $v = escape_html $a->{$_};
+                         if ($_ eq "slaying" && $is_exit{$type}) { # door, teleporter, player_changer
+                            $a->{msg} =~ /^final_map\s*(\S+)\s*$/m, $v = $1
+                               if $v eq "/!"; # random map
+                            print "slaying => <a href='$v.xhtml'>$v</a>\n";
+                         } elsif ($_ eq "other_arch") {
+                            print "$_ => <a href='/a/$a->{$_}'>$v</a>\n";
+                         } elsif ($_ eq "inventory") {
+                            print "inventory =>\n";
+                            print_archs ($a->{$_});
+                         } elsif ($_ eq "msg") {
+                            print "<p class='m'>$v</p>";
+                         } else {
+                            print "$_ => $v\n";
+                         }
+                      }
+                      print "</li>";
+                   }
+                   print "</ul>";
+                }
+                print_archs $as;
+                print "</div></div></td>";
+             } else {
+                print "<td/>";
+             }
+         }
+         print "</tr>";
+      }
+      print "</table><p class='footer'>created by <a href='http://software.schmorp.de/pkg/cfmaps'>cfmap2html</a> version $VERSION</p>",
+            "<p class='enlarge'/></body></html>";
+      close $fh;
+      #system "gzip", "-7f", "$path.xhtml";
+   }
+}

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing cfmaps/cfmap2html (file contents): Revision 1.23 by root, Wed Feb 14 02:33:47 2007 UTC vs. Revision 1.29 by root, Thu Jun 21 12:30:10 2007 UTC

Diff Legend

Comparing cfmaps/cfmap2html (file contents):
Revision 1.23 by root, Wed Feb 14 02:33:47 2007 UTC vs.
Revision 1.29 by root, Thu Jun 21 12:30:10 2007 UTC