--- deliantra/Deliantra-Client/DC/Protocol.pm	2007/04/10 11:12:53	1.100
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2007/04/23 19:22:24	1.104
@@ -17,12 +17,13 @@
 use base 'Crossfire::Protocol::Base';
 
 sub new {
-   my $class = shift;
+   my ($class, %arg) = @_;
 
-   my $self = $class->SUPER::new (@_,
+   my $self = $class->SUPER::new (%arg,
       setup_req => {
-         extmap    => 1,
-         smoothing => 1,
+         extmap => 1,
+         excmd  => 1,
+         %{$arg{setup_req} || {}},
       },
    );
 
@@ -635,31 +636,32 @@
    $self->{query}-> ($self, $flags, $prompt);
 }
 
+our @CF_COLOR = (
+   [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
+   [1.00, 1.00, 1.00],
+   [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
+   [1.00, 0.00, 0.00],
+   [1.00, 0.54, 0.00],
+   [0.11, 0.56, 1.00],
+   [0.93, 0.46, 0.00],
+   [0.18, 0.54, 0.34],
+   [0.56, 0.73, 0.56],
+   [0.80, 0.80, 0.80],
+   [0.75, 0.61, 0.20],
+   [0.99, 0.77, 0.26],
+   [0.74, 0.65, 0.41],
+);
+
 sub drawinfo {
    my ($self, $color, $text) = @_;
 
-   my @color = (
-      [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
-      [1.00, 1.00, 1.00],
-      [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
-      [1.00, 0.00, 0.00],
-      [1.00, 0.54, 0.00],
-      [0.11, 0.56, 1.00],
-      [0.93, 0.46, 0.00],
-      [0.18, 0.54, 0.34],
-      [0.56, 0.73, 0.56],
-      [0.80, 0.80, 0.80],
-      [0.75, 0.61, 0.20],
-      [0.99, 0.77, 0.26],
-      [0.74, 0.65, 0.41],
-   );
-
-   my $fg = $color[$color % @color];
+   my $fg = $CF_COLOR[$color % @CF_COLOR];
 
    $self->logprint ("info: ", $text);
 
-   # try to create single paragraphs of multiple lines sent by the server
-   $text =~ s/(?<=\S)\n(?=\w)/ /g;
+   ## try to create single paragraphs of multiple lines sent by the server
+   # no longer neecssary with TRT servers
+   #$text =~ s/(?<=\S)\n(?=\w)/ /g;
 
    $text = CFPlus::asxml $text;
    $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
@@ -922,8 +924,10 @@
     . "protocol version <tt>$self->{version}</tt>\n"
     . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
     . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
+    . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
     . "editing support $yesno[!!$self->{editor_support}]\n"
     . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
+    . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
     . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
       . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
     . "map size $self->{mapw}×$self->{maph}\n"