--- deliantra/Deliantra-Client/DC/Protocol.pm	2012/01/04 11:23:23	1.220
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2012/11/04 02:13:53	1.221
@@ -29,12 +29,58 @@
    my $self = $class->SUPER::new (%arg,
       setup_req => {
          extmap => 1,
-         excmd  => 1,
          widget => 2,
          %{$arg{setup_req} || {}},
       },
    );
 
+   $self->update_fx_want;
+
+   my $guard = $self->addme_guard;
+   $self->send_exti_req (resource => "exp_table", sub {
+      my ($idx) = @_;
+
+      $self->register_face_handler ($idx, sub {
+         my ($face) = @_;
+
+         undef $guard;
+         $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
+         $_->() for values %{ $self->{on_exp_update} };
+      });
+
+      ()
+   });
+
+   my $guard = $self->addme_guard;
+   $self->send_exti_req (resource => "skill_info", sub {
+      my ($idx) = @_;
+
+      $self->register_face_handler ($idx, sub {
+         my ($face) = @_;
+
+         undef $guard;
+         my $info = $self->{json_coder}->decode (delete $face->{data});
+         $self->{skill_info} = { map { CS_STAT_SKILLINFO + $_ => $info->[$_][0] } 0 .. $#$info };
+      });
+
+      ()
+   });
+
+   my $guard = $self->addme_guard;
+   $self->send_exti_req (resource => "spell_paths", sub {
+      my ($idx) = @_;
+
+      $self->register_face_handler ($idx, sub {
+         my ($face) = @_;
+
+         undef $guard;
+         my $info = $self->{json_coder}->decode (delete $face->{data});
+         $self->{spell_paths} = { map { (1 << $_) => $info->[$_][0] } 0 .. $#$info };
+      });
+
+      ()
+   });
+
    $self->{map_widget}->clr_commands;
 
    my @cmd_help = map {
@@ -132,21 +178,6 @@
 sub ext_capabilities {
    my ($self, %cap) = @_;
 
-   $self->update_fx_want;
-
-   $self->send_exti_req (resource => "exp_table", sub {
-      my ($exp_table) = @_;
-
-      $self->register_face_handler ($exp_table, sub {
-         my ($face) = @_;
-
-         $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
-         $_->() for values %{ $self->{on_exp_update} || {} };
-      });
-
-      ()
-   });
-
    if (my $ts = $cap{tileset}) {
       if (my ($default) = grep $_->[2] & 1, @$ts) {
          $self->{tileset} = $default;
@@ -456,7 +487,7 @@
           (
              ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
              map {
-                $stats->{$_} && $prev->{$_} 
+                $stats->{$_} && $prev->{$_}
                    && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
              } sort { $a <=> $b } keys %{$self->{skill_info}}
           )
@@ -671,7 +702,7 @@
 sub feed_map1a {
    my ($self, $data) = @_;
 
-   my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
+   my $missing = $self->{map}->map1a_update ($data);
    my $delay;
 
    for my $tile (@$missing) {
@@ -1350,12 +1381,7 @@
    $::SERVER_INFO->set_markup (
       "server <tt>$self->{host}:$self->{port}</tt>\n"
     . "protocol version <tt>$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"
     . "client support $yesno[$self->{cfplus_ext} > 0]"
       . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
     . "map size $self->{mapw}×$self->{maph}\n"