--- deliantra/Deliantra-Client/DC/Protocol.pm	2007/08/13 14:15:09	1.152
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2007/08/14 13:25:25	1.154
@@ -554,9 +554,9 @@
 
    my ($hash, $x, $y, $w, $h) = @$map_info;
 
-   my $data = $self->{map}->get_rect ($x, $y, $w, $h);
-   CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
-   #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
+   my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
+   $self->{map_cache_new}{$hash} = \$data;
+   CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
 }
 
 sub map_clear {
@@ -915,14 +915,19 @@
       $self->logprint ("msg: ", $text);
       return if $color < 0; # negative color == ignore if not understood
 
-      my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
+      my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
 
       ## try to create single paragraphs of multiple lines sent by the server
       # no longer neecssary with TRT servers
       #$text =~ s/(?<=\S)\n(?=\w)/ /g;
 
-      ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
-         for split /\n/, $text;
+      ::message ({
+         fg          => $fg,
+         markup      => $_,
+         type        => $type,
+         extra       => [@extra],
+         color_flags => $color
+      }) for split /\n/, $text;
 
       $self->{statusbox}->add ($text,
          group        => $text,