--- deliantra/Deliantra-Client/DC/Protocol.pm	2008/12/07 16:20:44	1.206
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2009/12/22 00:35:44	1.214
@@ -3,6 +3,8 @@
 use utf8;
 use strict;
 
+use Guard ();
+
 use Deliantra::Protocol::Constants;
 
 use DC;
@@ -18,7 +20,7 @@
          "dialogue.png", minify => 1, mipmap => 1;
 
 our $TEX_NOFACE = new_from_resource DC::Texture
-        "noface.png", minify => 1, mipmap => 1;
+        "noface.png", minify => 1, mipmap => 1, wrap => 1;
 
 sub MIN_TEXTURE_UNUSED() { 1 }#d#
 
@@ -279,6 +281,9 @@
       tooltip        => $DC::UI::TOOLTIP,
 
       mapwidget      => $::MAPWIDGET,
+      menubar        => $::MENUBAR,
+      menupopup      => $::MENUPOPUP,
+      pickup_enable  => $::PICKUP_ENABLE,
       buttonbar      => $::BUTTONBAR,
       metaserver     => $::METASERVER,
       buttonbar      => $::BUTTONBAR,
@@ -305,7 +310,7 @@
       help_window    => $::HELP_WINDOW,
       message_window => $::MESSAGE_WINDOW,
       message_dist   => $::MESSAGE_DIST,
-      statusbox      => $::SDTATUSBOX,
+      statusbox      => $::STATUSBOX,
 
       inv            => $::INV,
       invr           => $::INVR,
@@ -399,7 +404,7 @@
                  }
               sort { $a <=> $b } keys %{$self->{spell_paths}};
 
-   join "", @diff
+   "\u$name: " . (join ", ", @diff)
 }
 
 # all stats that are chacked against changes
@@ -464,7 +469,7 @@
    if (
       my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
    ) {
-      my $msg = "<b>stat change</b>: " . (join " ", @diffs);
+      my $msg = "<b>stat change</b>: " . (join " ", map "($_)", @diffs);
       $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
    }
 
@@ -512,9 +517,9 @@
    $::GAUGES->{mana}    ->set_value ($sp, $sp_m);
    $::GAUGES->{food}    ->set_value ($fo, $fo_m);
    $::GAUGES->{grace}   ->set_value ($gr, $gr_m);
-   $::GAUGES->{exp}     ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
-                                    . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
-   $::GAUGES->{prg}     ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
+   $::GAUGES->{exp}     ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
+                                     . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
+   $::GAUGES->{exp}     ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
    $::GAUGES->{range}   ->set_text ($stats->{+CS_STAT_RANGE});
    my $title = $stats->{+CS_STAT_TITLE};
    $title =~ s/^Player: //;
@@ -637,8 +642,8 @@
       $sw->[1]->set_text ($val->[0] * 1);
       $sw->[2]->set_value (@$val);
 
-      $::GAUGES->{sklprg}->set_label ("$name %d%%");
-      $::GAUGES->{sklprg}->set_value (@$val);
+      $::GAUGES->{skillexp}->set_label ("$name %d%%");
+      $::GAUGES->{skillexp}->set_value (@$val);
    }
 }
 
@@ -987,7 +992,7 @@
       new DC::Texture
          tile => $tile,
          image => $data, delete_image => 1,
-         minify => 1, mipmap => 1;
+         minify => 1;
 
    if (my $cbs = delete $self->{tile_cb}{$tile}) {
       $_->($tex) for @$cbs;
@@ -1002,7 +1007,7 @@
    push @{$self->{face_cb}{$num}}, $cb;
 
    defined wantarray
-      ? DC::guard {
+      ? Guard::guard {
            @{$self->{face_cb}{$num}}
               = grep $_ != $cb,
                    @{$self->{face_cb}{$num}};
@@ -1385,7 +1390,7 @@
    $self->update_server_info;
 
    $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
-   $self->send_command ("pickup $::CFG->{pickup}");
+   $self->send_pickup ($::CFG->{pickup});
 
    $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]",
                                               DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d#