--- deliantra/Deliantra-Client/DC/Protocol.pm	2006/10/01 11:53:59	1.85
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2006/12/04 15:17:14	1.89
@@ -9,6 +9,8 @@
 use CFPlus::UI;
 use CFPlus::Pod;
 
+use Crossfire::Protocol::Base 0.95;
+
 use base 'Crossfire::Protocol::Base';
 
 sub new {
@@ -321,9 +323,8 @@
 sub user_send {
    my ($self, $command) = @_;
 
-   if ($self->{record}) {
-      push @{$self->{record}}, $command;
-   }
+   push @{$self->{record}}, $command
+      if $self->{record};
 
    $self->logprint ("send: ", $command);
    $self->send_command ($command);
@@ -625,8 +626,6 @@
 
    $self->logprint ("info: ", $text);
 
-   my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
-
    # try to create single paragraphs of multiple lines sent by the server
    $text =~ s/(?<=\S)\n(?=\w)/ /g;
 
@@ -634,9 +633,8 @@
    $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
    $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
 
-   $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
-      for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
-   $self->{logview}->scroll_to_bottom;
+   ::message ({ fg => $color[$color], markup => $_ })
+      for split /\n/, $text;
 
    $self->{statusbox}->add ($text,
       group        => $text,
@@ -660,7 +658,7 @@
    $spell->{message} =~ s/\n+$//;
    $spell->{message} ||= "Server did not provide a description for this spell.";
 
-   $::SPELL_PAGE->add_spell ($spell);
+   $::SPELL_LIST->add_spell ($spell);
 
    $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
    $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
@@ -669,7 +667,13 @@
 sub spell_delete {
    my ($self, $spell) = @_;
 
-   $::SPELL_PAGE->remove_spell ($spell);
+   $::SPELL_LIST->remove_spell ($spell);
+}
+
+sub setup {
+   my ($self, $setup) = @_;
+
+   $::MAP->resize ($self->{mapw}, $self->{maph});
 }
 
 sub addme_success {
@@ -885,13 +889,14 @@
     . "protocol version <tt>$self->{version}</tt>\n"
     . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
     . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
-    . "editor support $yesno[!!length $self->{cvs_root}]\n"
-    . "test server " . (length $self->{test_server} ? $self->{test_server} : $yesno[0]) . "\n"
+    . "editing support $yesno[!!$self->{editor_support}]\n"
     . "map attributes $yesno[$self->{setup}{extmap} > 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"
    );
+
+   ::setup_build_button ($self->{editor_support}->{builder_ui});
 }
 
 sub logged_in {
@@ -903,9 +908,7 @@
 
       if ($self->{cfplus_ext} >= 2) {
          $self->send_ext_req ("editor_support", sub {
-            $self->{cvs_root}    = $_[0]{cvs_root};
-            $self->{upload}      = $_[0]{upload};
-            $self->{test_server} = $_[0]{server};
+            $self->{editor_support} = $_[0];
             $self->update_server_info;
 
             0
@@ -922,6 +925,14 @@
    $self->send_command ("pickup $::CFG->{pickup}");
 }
 
+sub buildat {
+   my ($self, $builditem, $x, $y) = @_;
+
+   if ($self->{cfplus_ext}) {
+      $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
+   }
+}
+
 sub lookat {
    my ($self, $x, $y) = @_;