--- cfmaps/cfmap2html	2005/11/22 17:54:41	1.19
+++ cfmaps/cfmap2html	2007/02/14 02:33:47	1.23
@@ -1,7 +1,7 @@
 #!/opt/bin/perl
 
 # cfmap2html - convert crossfire maps to html
-# Copyright (C) 2005      Marc Lehmann <gvpe@schmorp.de>
+# Copyright (C) 2005,2007 Marc Lehmann <cfmaps@schmorp.de>
 #
 # CFMAP2HTML is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 # along with gvpe; if not, write to the Free Software
 # Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-our $VERSION = '1.2';
+our $VERSION = '1.212';
 
 use Storable;
 
@@ -121,7 +121,7 @@
           if (my $as = $meta->{map}[$x][$y]) {
              my @class;
 
-             push @class, "fishy"  if grep $_->{invisible} || $_->{face} || exists $_->{no_pass}, @$as;
+             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;
 
@@ -142,7 +142,7 @@
                    my $aname = escape_html $a->{_name};
                    my $name = escape_html $a->{name} || $o->{name};
 
-                   print "<li><a href='/arc.xhtml#", (lc $a->{_name}), "'>$aname \"$name\"</a>\n";
+                   print "<li><a href='/a/$a->{_name}'>$aname \"$name\"</a>\n";
                    for (sort keys %$a) {
                       next if $ignore{$_};
                       my $v = escape_html $a->{$_};
@@ -153,7 +153,7 @@
 
                          print "slaying => <a href='$v.xhtml'>$v</a>\n";
                       } elsif ($_ eq "other_arch") {
-                         print "$_ => <a href='/arc.xhtml#", (lc $a->{$_}), "'>$v</a>\n";
+                         print "$_ => <a href='/a/$a->{$_}'>$v</a>\n";
                       } elsif ($_ eq "inventory") {
                          print "inventory =>\n";
                          print_archs ($a->{$_});
@@ -177,7 +177,7 @@
       print "</tr>";
    }
 
-   print "</table><p class='footer'>created by <a href='http://software.schmorp.de/#crossfire'>cfmap2html</a> version $VERSION</p>",
+   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;