ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.1 by root, Fri May 26 18:56:14 2006 UTC vs.
Revision 1.6 by root, Sat May 27 19:49:07 2006 UTC

1package CFClient::Protocol; 1package CFClient::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5
6use Crossfire::Protocol::Constants;
5 7
6use CFClient::UI; 8use CFClient::UI;
7 9
8use base 'Crossfire::Protocol::Base'; 10use base 'Crossfire::Protocol::Base';
9 11
… …
23 25
24 my $cmd = $1; 26 my $cmd = $1;
25 my @args = split /\|/, $2; 27 my @args = split /\|/, $2;
26 @args = (".*") unless @args; 28 @args = (".*") unless @args;
27 29
30 $_ = $_ eq ".*" ? "" : " $_"
31 for @args;
32
28 my $text = CFClient::pod_to_pango $head2->content; 33 my $text = CFClient::pod_to_pango $head2->content;
29 34
30 for my $arg (@args) {
31 $arg = $arg eq ".*" ? "" : " $arg";
32
33 $self->{map_widget}->add_command ("$cmd$arg", $text); 35 $self->{map_widget}->add_command ("$cmd$_", $text)
34 } 36 for sort { (length $a) <=> (length $b) }
37 @args;
35 } 38 }
36 39
37 $self->{noface} = new_from_file CFClient::Texture 40 $self->{noface} = new_from_file CFClient::Texture
38 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 41 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
39 42
… …
50} 53}
51 54
52sub stats_update { 55sub stats_update {
53 my ($self, $stats) = @_; 56 my ($self, $stats) = @_;
54 57
55 if (my $exp = $stats->{Crossfire::Protocol::Base::CS_STAT_EXP64}) { 58 if (my $exp = $stats->{+CS_STAT_EXP64}) {
56 my $diff = $exp - $self->{prev_exp}; 59 my $diff = $exp - $self->{prev_exp};
57 $self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5) 60 $self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
58 if exists $self->{prev_exp} && $diff; 61 if exists $self->{prev_exp} && $diff;
59 $self->{prev_exp} = $exp; 62 $self->{prev_exp} = $exp;
60 } 63 }
… …
64 67
65sub user_send { 68sub user_send {
66 my ($self, $command) = @_; 69 my ($self, $command) = @_;
67 70
68 $self->send_command ($command); 71 $self->send_command ($command);
69 status $command; 72 ::status $command;
70} 73}
71 74
72sub map_scroll { 75sub map_scroll {
73 my ($self, $dx, $dy) = @_; 76 my ($self, $dx, $dy) = @_;
74 77
… …
329 $vbox->add (new CFClient::UI::Label 332 $vbox->add (new CFClient::UI::Label
330 max_w => $::WIDTH * 0.4, 333 max_w => $::WIDTH * 0.4,
331 ellipsise => 0, 334 ellipsise => 0,
332 text => $prompt); 335 text => $prompt);
333 336
334 if ($flags & Crossfire::Protocol::Base::CS_QUERY_YESNO) { 337 if ($flags & CS_QUERY_YESNO) {
335 $vbox->add (my $hbox = new CFClient::UI::HBox); 338 $vbox->add (my $hbox = new CFClient::UI::HBox);
336 $hbox->add (new CFClient::UI::Button 339 $hbox->add (new CFClient::UI::Button
337 text => "No", 340 text => "No",
338 connect_activate => sub { 341 connect_activate => sub {
339 $self->send ("reply n"); 342 $self->send ("reply n");
… …
349 }, 352 },
350 ); 353 );
351 354
352 $dialog->focus_in; 355 $dialog->focus_in;
353 356
354 } elsif ($flags & Crossfire::Protocol::Base::CS_QUERY_SINGLECHAR) { 357 } elsif ($flags & CS_QUERY_SINGLECHAR) {
355 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; 358 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
356 $vbox->add (my $entry = new CFClient::UI::Entry 359 $vbox->add (my $entry = new CFClient::UI::Entry
357 connect_changed => sub { 360 connect_changed => sub {
358 $self->send ("reply $_[1]"); 361 $self->send ("reply $_[1]");
359 $dialog->destroy; 362 $dialog->destroy;
… …
364 367
365 } else { 368 } else {
366 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 369 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
367 370
368 $vbox->add (my $entry = new CFClient::UI::Entry 371 $vbox->add (my $entry = new CFClient::UI::Entry
369 $flags & Crossfire::Protocol::Base::CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (), 372 $flags & CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
370 connect_activate => sub { 373 connect_activate => sub {
371 $self->send ("reply $_[1]"); 374 $self->send ("reply $_[1]");
372 $dialog->destroy; 375 $dialog->destroy;
373 }, 376 },
374 ); 377 );
… …
602 return; 605 return;
603 } 606 }
604 607
605 CFClient::Item::update_widgets $item; 608 CFClient::Item::update_widgets $item;
606 609
607 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & Crossfire::Protocol::Base::F_OPEN)) { 610 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
608 set_opencont ($::CONN, 0, "Floor"); 611 set_opencont ($::CONN, 0, "Floor");
609 612
610 } elsif ($item->{flags} & Crossfire::Protocol::Base::F_OPEN) { 613 } elsif ($item->{flags} & F_OPEN) {
611 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 614 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
612 } else { 615 } else {
613 if ($item->{container} == 0) { 616 if ($item->{container} == 0) {
614 update_floorbox; 617 update_floorbox;
615 update_container (0); 618 update_container (0);
… …
617 $::INV->set_items ($self->{container}{$item->{container}}) 620 $::INV->set_items ($self->{container}{$item->{container}})
618 } 621 }
619 } 622 }
620} 623}
621 624
625sub player_update {
626 my ($self, $player) = @_;
627 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
628}
629
6221; 6301;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines