--- deliantra/Deliantra-Client/bin/pclient 2006/04/16 17:43:17 1.118
+++ deliantra/Deliantra-Client/bin/pclient 2006/04/17 20:29:37 1.125
@@ -51,6 +51,8 @@
our $CONSOLE;
our $METASERVER;
+our $GAUGES;
+
our $SDL_ACTIVE;
our $SDL_EV;
our %SDL_CB;
@@ -302,8 +304,8 @@
my $window = new CFClient::UI::FancyFrame
border_bg => [1, 1, 1, 0.5],
bg => [0.3, 0.3, 0.3, 0.8],
- user_w => $::WIDTH/4,
- user_h => $::HEIGHT,
+ user_w => int $::WIDTH / 3,
+ user_h => int $::HEIGHT / 5,
child => (my $vbox = new CFClient::UI::VBox);
$vbox->add ($LOGVIEW = new CFClient::UI::TextView
@@ -311,7 +313,7 @@
fontsize => $::CFG->{log_fontsize},
);
- $vbox->add (my $input = new CFClient::UI::LineEntry
+ $vbox->add (my $input = new CFClient::UI::Entry
connect_focus_in => sub {
my ($input, $prev_focus) = @_;
@@ -327,10 +329,10 @@
$input->set_text ('');
if ($text =~ /^\/(.*)/) {
- $::CONN->user_send ("command $1");
+ $::CONN->user_send ($1);
} else {
my $say_cmd = $::CFG->{say_command} || 'say';
- $::CONN->user_send ("command $say_cmd $text");
+ $::CONN->user_send ("$say_cmd $text");
}
if ($input->{refocus_map}) {
delete $input->{refocus_map};
@@ -406,10 +408,10 @@
$CFClient::UI::ROOT->add ($STATUS_LINE);
$ALT_ENTER_MESSAGE = new CFClient::UI::Label
- padding => 0,
- y => $HEIGHT * 44 / 45,
- height => $HEIGHT / 45,
- text => "Use Alt-Enter to toggle fullscreen mode";
+ padding => 0,
+ y => $HEIGHT * 44 / 45,
+ fontsize => $HEIGHT / 45,
+ markup => "Use Alt-Enter to toggle fullscreen mode";
$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
@@ -438,7 +440,17 @@
status "Configuration Saved";
});
- $BUTTONBAR->{children}[0]->emit ("activate");
+ $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
+
+ my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 150, y => 0);
+ $tgw->add (my $hb = new CFClient::UI::HBox (req_w => 60, req_h => 150));
+ $hb->add (my $fg = new CFClient::UI::VGauge (w => 30, h => 150, gauge => 'food', expand => 1));
+ $hb->add (my $mg = new CFClient::UI::VGauge (w => 30, h => 150, gauge => 'mana', expand => 1));
+ $hb->add (my $hg = new CFClient::UI::VGauge (w => 30, h => 150, gauge => 'hp', expand => 1));
+ $hb->add (my $gg = new CFClient::UI::VGauge (w => 30, h => 150, gauge => 'grace', expand => 1));
+
+ $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
+ $CFClient::UI::ROOT->add ($tgw);
}
sub destroy_screen {
@@ -504,19 +516,45 @@
@conn::ISA = Crossfire::Protocol::;
+sub conn::stats_update {
+ my ($self, $stats) = @_;
+
+ # i love text protocols!!!
+ # FIXME: the stats are somehow weird
+ my $hp = $stats->{1};
+ my $hp_m = $stats->{2};
+ my $sp = $stats->{3};
+ my $sp_m = $stats->{4};
+ my $fo = $stats->{18};
+ my $fo_m = 1000;
+ my $gr = $stats->{23};
+ my $gr_m = $stats->{24};
+
+ #d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
+ $GAUGES->{hp}->set_value ($hp, $hp_m);
+ $GAUGES->{mana}->set_value ($sp, $sp_m);
+ $GAUGES->{food}->set_value ($fo, $fo_m);
+ $GAUGES->{grace}->set_value ($gr, $gr_m);
+}
+
sub conn::user_send {
my ($self, $command) = @_;
- $self->send ($command);
+ $self->send_command ($command);
status $command;
}
+sub conn::map_scroll {
+ my ($self, $dx, $dy) = @_;
+
+ $MAP->scroll ($dx, $dy);
+}
+
sub conn::feed_map1a {
my ($self, $data) = @_;
# $self->Crossfire::Protocol::feed_map1a ($data);
- $MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
$MAP->map1a_update ($data);
$MAPWIDGET->update;
}
@@ -540,23 +578,18 @@
my ($self) = @_;
$self->flush_map;
+ delete $self->{neigh};
$MAP->clear;
}
-sub conn::map_info {
- my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
-
- $self->flush_map;
-
- $x = $::MAP->ox - $x;
- $y = $::MAP->oy - $y;
- $self->{map_info} = [$hash, $x, $y, $w, $h];
+sub conn::load_map($$$) {
+ my ($self, $hash, $x, $y) = @_;
if (defined (my $data = $MAPCACHE->get ($hash))) {
$data = Compress::LZF::decompress $data;
- warn sprintf "LOADmap[%s] length %d\n", $hash, length $data;#d#
+ warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
for my $id ($MAP->set_rect ($x, $y, $data)) {
my $data = $TILECACHE->get ($id)
or next;
@@ -566,6 +599,62 @@
}
}
+sub conn::flood_fill {
+ my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;
+
+ # the server does not allow map paths > 6
+ return if 6 <= length $path;
+
+ for my $tile (1..4) {
+ next if $self->{neigh}{$hash}[$tile];
+ next unless $flags & (1 << ($tile - 1));
+
+ my $neigh = $self->{neigh}{$hash} ||= [];
+
+ $self->send_mapinfo ("spatial $path$tile", sub {
+ my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
+
+ #warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
+ return if $mode ne "spatial";
+
+ $x += $MAP->ox;
+ $y += $MAP->oy;
+
+ $self->load_map ($hash, $x, $y)
+ unless $self->{neigh}{$hash}[5]++;#d#
+
+ $neigh->[$tile] = [$x, $y, $w, $h];
+
+ $self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1)
+ if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
+ });
+ }
+}
+
+sub conn::map_change {
+ my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
+
+ $self->flush_map;
+
+ my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
+
+ warn "$ox $oy map_info<$flags, $x, $y, $w, $h, $hash>\n";#d#
+
+ my $mapmapw = 250;
+ my $mapmaph = 250;
+
+ $self->flood_fill ("", $hash, $flags,
+ $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
+ $ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
+
+ $x += $ox;
+ $y += $oy;
+
+ $self->{map_info} = [$hash, $x, $y, $w, $h];
+
+ $self->load_map ($hash, $x, $y);
+}
+
sub conn::face_find {
my ($self, $facenum, $face) = @_;
@@ -725,8 +814,6 @@
$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
-init_screen;
-
{
my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
@@ -734,6 +821,8 @@
CFClient::set_font $fonts[0];
}
+init_screen;
+
Event::loop;