--- deliantra/Deliantra-Client/DC/Protocol.pm 2009/01/11 03:19:47 1.208
+++ deliantra/Deliantra-Client/DC/Protocol.pm 2010/04/08 19:11:21 1.218
@@ -1,7 +1,8 @@
package DC::Protocol;
-use utf8;
-use strict;
+use common::sense;
+
+use Guard ();
use Deliantra::Protocol::Constants;
@@ -18,10 +19,7 @@
"dialogue.png", minify => 1, mipmap => 1;
our $TEX_NOFACE = new_from_resource DC::Texture
- "noface.png", minify => 1, mipmap => 1;
-
-our $TEX_HIDDEN = new_from_resource DC::Texture
- "hidden.png", minify => 1, mipmap => 1;
+ "noface.png", minify => 1, mipmap => 1, wrap => 1;
sub MIN_TEXTURE_UNUSED() { 1 }#d#
@@ -98,11 +96,6 @@
$self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
}
- {
- $self->{hidden} = my $tex = $TEX_HIDDEN;
- $self->{map}->set_texture (3, @$tex{qw(name w h s t)}, @{$tex->{minified}});
- }
-
# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id
# $self->{expire_w} = EV::timer 1, 1, sub {
# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1;
@@ -289,6 +282,7 @@
mapwidget => $::MAPWIDGET,
menubar => $::MENUBAR,
menupopup => $::MENUPOPUP,
+ pickup_enable => $::PICKUP_ENABLE,
buttonbar => $::BUTTONBAR,
metaserver => $::METASERVER,
buttonbar => $::BUTTONBAR,
@@ -409,7 +403,7 @@
}
sort { $a <=> $b } keys %{$self->{spell_paths}};
- join "", @diff
+ "\u$name: " . (join ", ", @diff)
}
# all stats that are chacked against changes
@@ -474,7 +468,7 @@
if (
my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
) {
- my $msg = "stat change: " . (join " ", @diffs);
+ my $msg = "stat change: " . (join " ", map "($_)", @diffs);
$self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
}
@@ -522,9 +516,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: //;
@@ -546,7 +540,7 @@
$self->update_weight;
- $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
+ $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%%", $stats->{$RES_TBL{$_}})
for keys %RES_TBL;
my $sktbl = $::STATWIDS->{skill_tbl};
@@ -647,8 +641,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);
}
}
@@ -997,7 +991,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;
@@ -1012,7 +1006,7 @@
push @{$self->{face_cb}{$num}}, $cb;
defined wantarray
- ? DC::guard {
+ ? Guard::guard {
@{$self->{face_cb}{$num}}
= grep $_ != $cb,
@{$self->{face_cb}{$num}};
@@ -1355,9 +1349,11 @@
my @yesno = ("no", "yes");
+ my $version = JSON::XS->new->encode ($self->{s_version});
+
$::SERVER_INFO->set_markup (
"server $self->{host}:$self->{port}\n"
- . "protocol version $self->{version}\n"
+ . "protocol version $version\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"
@@ -1395,10 +1391,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_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]",
- DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d#
+ $self->send_pickup ($::CFG->{pickup});
}
sub lookat {