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.202 by root, Tue Sep 9 10:27:26 2008 UTC vs.
Revision 1.209 by root, Sun Jan 11 22:11:23 2009 UTC

1package DC::Protocol; 1package DC::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5
6use Guard ();
5 7
6use Deliantra::Protocol::Constants; 8use Deliantra::Protocol::Constants;
7 9
8use DC; 10use DC;
9use DC::DB; 11use DC::DB;
… …
17our $TEX_DIALOGUE = new_from_resource DC::Texture 19our $TEX_DIALOGUE = new_from_resource DC::Texture
18 "dialogue.png", minify => 1, mipmap => 1; 20 "dialogue.png", minify => 1, mipmap => 1;
19 21
20our $TEX_NOFACE = new_from_resource DC::Texture 22our $TEX_NOFACE = new_from_resource DC::Texture
21 "noface.png", minify => 1, mipmap => 1; 23 "noface.png", minify => 1, mipmap => 1;
24
25our $TEX_HIDDEN = new_from_resource DC::Texture
26 "hidden.png", minify => 1, mipmap => 1;
27
28sub MIN_TEXTURE_UNUSED() { 1 }#d#
22 29
23sub new { 30sub new {
24 my ($class, %arg) = @_; 31 my ($class, %arg) = @_;
25 32
26 my $self = $class->SUPER::new (%arg, 33 my $self = $class->SUPER::new (%arg,
… …
73 for values %{delete $ws->{w} || {}}; 80 for values %{delete $ws->{w} || {}};
74 } 81 }
75 82
76 delete $self->{items}; 83 delete $self->{items};
77 $::INV->clear; 84 $::INV->clear;
85 $::INVR->clear;
78 $::INVR_HB->clear; 86 $::INVR_HB->clear;
79 $::FLOORBOX->clear; 87 $::FLOORBOX->clear;
80 }); 88 });
81 89
82 $self->{map_widget}->add_command (@$_) 90 $self->{map_widget}->add_command (@$_)
… …
89 97
90 { 98 {
91 $self->{noface} = my $tex = $TEX_NOFACE; 99 $self->{noface} = my $tex = $TEX_NOFACE;
92 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 100 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
93 } 101 }
102
103 {
104 $self->{hidden} = my $tex = $TEX_HIDDEN;
105 $self->{map}->set_texture (3, @$tex{qw(name w h s t)}, @{$tex->{minified}});
106 }
107
108# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id
109# $self->{expire_w} = EV::timer 1, 1, sub {
110# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1;
111#
112# for ($self->{map}->expire_textures ($self->{expire_count}, $count)) {
113# warn DC::SvREFCNT $self->{texture}[$_];
114# $self->{texture}[$_]->unload;
115# warn "expire texture $_\n";#d#
116# }
117#
118# ($self->{expire_count} += $count) < @{ $self->{texture} }
119# or $self->{expire_count} = DC::DB::FIRST_TILE_ID;
120# warn "count is $count\n";#d#
121# };
94 122
95 $self->{open_container} = 0; 123 $self->{open_container} = 0;
96 124
97 # per server 125 # per server
98 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 126 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
… …
259 my %wkw = ( 287 my %wkw = (
260 root => $DC::UI::ROOT, 288 root => $DC::UI::ROOT,
261 tooltip => $DC::UI::TOOLTIP, 289 tooltip => $DC::UI::TOOLTIP,
262 290
263 mapwidget => $::MAPWIDGET, 291 mapwidget => $::MAPWIDGET,
292 menubar => $::MENUBAR,
293 menupopup => $::MENUPOPUP,
294 pickup_enable => $::PICKUP_ENABLE,
264 buttonbar => $::BUTTONBAR, 295 buttonbar => $::BUTTONBAR,
265 metaserver => $::METASERVER, 296 metaserver => $::METASERVER,
266 buttonbar => $::BUTTONBAR, 297 buttonbar => $::BUTTONBAR,
267 login_button => $::LOGIN_BUTTON, 298 login_button => $::LOGIN_BUTTON,
268 quit_dialog => $::QUIT_DIALOG, 299 quit_dialog => $::QUIT_DIALOG,
… …
285 316
286 floorbox => $::FLOORBOX, 317 floorbox => $::FLOORBOX,
287 help_window => $::HELP_WINDOW, 318 help_window => $::HELP_WINDOW,
288 message_window => $::MESSAGE_WINDOW, 319 message_window => $::MESSAGE_WINDOW,
289 message_dist => $::MESSAGE_DIST, 320 message_dist => $::MESSAGE_DIST,
290 statusbox => $::SDTATUSBOX, 321 statusbox => $::STATUSBOX,
291 322
292 inv => $::INV, 323 inv => $::INV,
293 invr => $::INVR, 324 invr => $::INVR,
294 invr_hb => $::INVR_HB, 325 invr_hb => $::INVR_HB,
295 ); 326 );
… …
492 523
493 $::GAUGES->{hp} ->set_value ($hp, $hp_m); 524 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
494 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 525 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
495 $::GAUGES->{food} ->set_value ($fo, $fo_m); 526 $::GAUGES->{food} ->set_value ($fo, $fo_m);
496 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 527 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
497 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 528 $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
498 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 529 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
499 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); 530 $::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
500 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 531 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
501 my $title = $stats->{+CS_STAT_TITLE}; 532 my $title = $stats->{+CS_STAT_TITLE};
502 $title =~ s/^Player: //; 533 $title =~ s/^Player: //;
503 $::STATWIDS->{title} ->set_text ("Title: " . $title); 534 $::STATWIDS->{title} ->set_text ("Title: " . $title);
504 535
… …
545 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), 576 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
546 ]; 577 ];
547 578
548 my @add = @$sw; 579 my @add = @$sw;
549 580
550 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 581 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>";
551 582
552 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 583 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
553 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 584 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
554 585
555 my ($x, $y) = (0, 1); 586 my ($x, $y) = (0, 1);
… …
617 my $sw = $self->{skillwid}{$idx}; 648 my $sw = $self->{skillwid}{$idx};
618 $sw->[0]->set_text (::formsep ($val->[1])); 649 $sw->[0]->set_text (::formsep ($val->[1]));
619 $sw->[1]->set_text ($val->[0] * 1); 650 $sw->[1]->set_text ($val->[0] * 1);
620 $sw->[2]->set_value (@$val); 651 $sw->[2]->set_value (@$val);
621 652
622 $::GAUGES->{sklprg}->set_label ("$name %d%%"); 653 $::GAUGES->{skillexp}->set_label ("$name %d%%");
623 $::GAUGES->{sklprg}->set_value (@$val); 654 $::GAUGES->{skillexp}->set_value (@$val);
624 } 655 }
625} 656}
626 657
627sub user_send { 658sub user_send {
628 my ($self, $command) = @_; 659 my ($self, $command) = @_;
… …
655 for my $tile (@$missing) { 686 for my $tile (@$missing) {
656 next if $self->{delay}{$tile}; 687 next if $self->{delay}{$tile};
657 688
658 $delay = 1; 689 $delay = 1;
659 690
660 if (my $tex = $::CONN->{texture}[$tile]) { 691 if (my $tex = $self->{texture}[$tile]) {
661 $tex->upload; 692 $tex->upload;
662 } else { 693 } else {
663 $self->{delay}{$tile} = 1; 694 $self->{delay}{$tile} = 1;
664 695
665 # we assume the face is in-flight and will eventually come 696 # we assume the face is in-flight and will eventually arrive
666 push @{$self->{tile_cb}{$tile}}, sub { 697 push @{$self->{tile_cb}{$tile}}, sub {
667 delete $self->{delay}{$tile}; 698 delete $self->{delay}{$tile};
668 $_[0]->upload; 699 $_[0]->upload;
669 }; 700 };
670 } 701 }
671 } 702 }
672 703
673 if ($delay) { 704 if ($delay) {
674 # delay the map drawing a tiny bit in the hope of getting the missing fetched 705 # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched
675 EV::once undef, 0, 0.03, sub { 706 EV::once undef, 0, 0.03, sub {
676 $self->{map_widget}->update 707 $self->{map_widget}->update
677 if $self->{map_widget}; 708 if $self->{map_widget};
678 }; 709 };
679 } else { 710 } else {
… …
982 my ($self, $num, $cb) = @_; 1013 my ($self, $num, $cb) = @_;
983 1014
984 push @{$self->{face_cb}{$num}}, $cb; 1015 push @{$self->{face_cb}{$num}}, $cb;
985 1016
986 defined wantarray 1017 defined wantarray
987 ? DC::guard { 1018 ? Guard::guard {
988 @{$self->{face_cb}{$num}} 1019 @{$self->{face_cb}{$num}}
989 = grep $_ != $cb, 1020 = grep $_ != $cb,
990 @{$self->{face_cb}{$num}}; 1021 @{$self->{face_cb}{$num}};
991 } 1022 }
992 : () 1023 : ()
… …
1365 }); 1396 });
1366 1397
1367 $self->update_server_info; 1398 $self->update_server_info;
1368 1399
1369 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1400 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1370 $self->send_command ("pickup $::CFG->{pickup}"); 1401 $self->send_pickup ($::CFG->{pickup});
1371 1402
1372 $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]", 1403 $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]",
1373 DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d# 1404 DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d#
1374} 1405}
1375 1406
… …
1542} 1573}
1543 1574
1544sub send { 1575sub send {
1545 my ($self, $msg) = @_; 1576 my ($self, $msg) = @_;
1546 1577
1547 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg }); 1578 $self->{textview}->add_paragraph ({
1579 markup =>
1580 "\n<span foreground='#ffff00'><b>"
1581 . (DC::asxml $msg)
1582 . "</b></span>"
1583 });
1548 $self->{textview}->scroll_to_bottom; 1584 $self->{textview}->scroll_to_bottom;
1549 1585
1550 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1586 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1551} 1587}
1552 1588

Diff Legend

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