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.206 by elmex, Sun Dec 7 16:20:44 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;
22 27
23sub MIN_TEXTURE_UNUSED() { 1 }#d# 28sub MIN_TEXTURE_UNUSED() { 1 }#d#
24 29
25sub new { 30sub new {
26 my ($class, %arg) = @_; 31 my ($class, %arg) = @_;
… …
91 } 96 }
92 97
93 { 98 {
94 $self->{noface} = my $tex = $TEX_NOFACE; 99 $self->{noface} = my $tex = $TEX_NOFACE;
95 $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}});
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}});
96 } 106 }
97 107
98# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id 108# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id
99# $self->{expire_w} = EV::timer 1, 1, sub { 109# $self->{expire_w} = EV::timer 1, 1, sub {
100# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1; 110# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1;
… …
277 my %wkw = ( 287 my %wkw = (
278 root => $DC::UI::ROOT, 288 root => $DC::UI::ROOT,
279 tooltip => $DC::UI::TOOLTIP, 289 tooltip => $DC::UI::TOOLTIP,
280 290
281 mapwidget => $::MAPWIDGET, 291 mapwidget => $::MAPWIDGET,
292 menubar => $::MENUBAR,
293 menupopup => $::MENUPOPUP,
294 pickup_enable => $::PICKUP_ENABLE,
282 buttonbar => $::BUTTONBAR, 295 buttonbar => $::BUTTONBAR,
283 metaserver => $::METASERVER, 296 metaserver => $::METASERVER,
284 buttonbar => $::BUTTONBAR, 297 buttonbar => $::BUTTONBAR,
285 login_button => $::LOGIN_BUTTON, 298 login_button => $::LOGIN_BUTTON,
286 quit_dialog => $::QUIT_DIALOG, 299 quit_dialog => $::QUIT_DIALOG,
… …
303 316
304 floorbox => $::FLOORBOX, 317 floorbox => $::FLOORBOX,
305 help_window => $::HELP_WINDOW, 318 help_window => $::HELP_WINDOW,
306 message_window => $::MESSAGE_WINDOW, 319 message_window => $::MESSAGE_WINDOW,
307 message_dist => $::MESSAGE_DIST, 320 message_dist => $::MESSAGE_DIST,
308 statusbox => $::SDTATUSBOX, 321 statusbox => $::STATUSBOX,
309 322
310 inv => $::INV, 323 inv => $::INV,
311 invr => $::INVR, 324 invr => $::INVR,
312 invr_hb => $::INVR_HB, 325 invr_hb => $::INVR_HB,
313 ); 326 );
… …
510 523
511 $::GAUGES->{hp} ->set_value ($hp, $hp_m); 524 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
512 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 525 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
513 $::GAUGES->{food} ->set_value ($fo, $fo_m); 526 $::GAUGES->{food} ->set_value ($fo, $fo_m);
514 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 527 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
515 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 528 $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
516 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 529 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
517 $::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});
518 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 531 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
519 my $title = $stats->{+CS_STAT_TITLE}; 532 my $title = $stats->{+CS_STAT_TITLE};
520 $title =~ s/^Player: //; 533 $title =~ s/^Player: //;
521 $::STATWIDS->{title} ->set_text ("Title: " . $title); 534 $::STATWIDS->{title} ->set_text ("Title: " . $title);
522 535
… …
635 my $sw = $self->{skillwid}{$idx}; 648 my $sw = $self->{skillwid}{$idx};
636 $sw->[0]->set_text (::formsep ($val->[1])); 649 $sw->[0]->set_text (::formsep ($val->[1]));
637 $sw->[1]->set_text ($val->[0] * 1); 650 $sw->[1]->set_text ($val->[0] * 1);
638 $sw->[2]->set_value (@$val); 651 $sw->[2]->set_value (@$val);
639 652
640 $::GAUGES->{sklprg}->set_label ("$name %d%%"); 653 $::GAUGES->{skillexp}->set_label ("$name %d%%");
641 $::GAUGES->{sklprg}->set_value (@$val); 654 $::GAUGES->{skillexp}->set_value (@$val);
642 } 655 }
643} 656}
644 657
645sub user_send { 658sub user_send {
646 my ($self, $command) = @_; 659 my ($self, $command) = @_;
… …
1000 my ($self, $num, $cb) = @_; 1013 my ($self, $num, $cb) = @_;
1001 1014
1002 push @{$self->{face_cb}{$num}}, $cb; 1015 push @{$self->{face_cb}{$num}}, $cb;
1003 1016
1004 defined wantarray 1017 defined wantarray
1005 ? DC::guard { 1018 ? Guard::guard {
1006 @{$self->{face_cb}{$num}} 1019 @{$self->{face_cb}{$num}}
1007 = grep $_ != $cb, 1020 = grep $_ != $cb,
1008 @{$self->{face_cb}{$num}}; 1021 @{$self->{face_cb}{$num}};
1009 } 1022 }
1010 : () 1023 : ()
… …
1383 }); 1396 });
1384 1397
1385 $self->update_server_info; 1398 $self->update_server_info;
1386 1399
1387 $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;
1388 $self->send_command ("pickup $::CFG->{pickup}"); 1401 $self->send_pickup ($::CFG->{pickup});
1389 1402
1390 $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]", 1403 $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]",
1391 DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d# 1404 DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d#
1392} 1405}
1393 1406

Diff Legend

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