--- cfmaps/cfmap2html	2005/11/20 05:02:58	1.12
+++ cfmaps/cfmap2html	2005/11/20 20:37:13	1.18
@@ -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.12';
+our $VERSION = '1.2';
 
 use Storable;
 
@@ -62,11 +62,12 @@
    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",
@@ -111,13 +112,26 @@
    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) {
-          print "<td>";
           if (my $as = $meta->{map}[$x][$y]) {
-             print "<div><div>($x|$y)";
+             my @class;
+
+             push @class, "fishy"  if grep $_->{invisible} || $_->{face} || exists $_->{no_pass}, @$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>";
@@ -132,7 +146,7 @@
                       next if $ignore{$_};
                       my $v = escape_html $a->{$_};
 
-                      if ($_ eq "slaying" && ($type == 41 || $type == 57 || $type == 66)) { # door, teleporter, player_changer
+                      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
 
@@ -154,9 +168,10 @@
              }
 
              print_archs $as;
-             print "</div></div>";
+             print "</div></div></td>";
+          } else {
+             print "<td/>";
           }
-          print "</td>";
       }
       print "</tr>";
    }
