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.207 by root, Sat Dec 20 19:45:50 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;
… …
285 my %wkw = ( 287 my %wkw = (
286 root => $DC::UI::ROOT, 288 root => $DC::UI::ROOT,
287 tooltip => $DC::UI::TOOLTIP, 289 tooltip => $DC::UI::TOOLTIP,
288 290
289 mapwidget => $::MAPWIDGET, 291 mapwidget => $::MAPWIDGET,
292 menubar => $::MENUBAR,
293 menupopup => $::MENUPOPUP,
294 pickup_enable => $::PICKUP_ENABLE,
290 buttonbar => $::BUTTONBAR, 295 buttonbar => $::BUTTONBAR,
291 metaserver => $::METASERVER, 296 metaserver => $::METASERVER,
292 buttonbar => $::BUTTONBAR, 297 buttonbar => $::BUTTONBAR,
293 login_button => $::LOGIN_BUTTON, 298 login_button => $::LOGIN_BUTTON,
294 quit_dialog => $::QUIT_DIALOG, 299 quit_dialog => $::QUIT_DIALOG,
… …
311 316
312 floorbox => $::FLOORBOX, 317 floorbox => $::FLOORBOX,
313 help_window => $::HELP_WINDOW, 318 help_window => $::HELP_WINDOW,
314 message_window => $::MESSAGE_WINDOW, 319 message_window => $::MESSAGE_WINDOW,
315 message_dist => $::MESSAGE_DIST, 320 message_dist => $::MESSAGE_DIST,
316 statusbox => $::SDTATUSBOX, 321 statusbox => $::STATUSBOX,
317 322
318 inv => $::INV, 323 inv => $::INV,
319 invr => $::INVR, 324 invr => $::INVR,
320 invr_hb => $::INVR_HB, 325 invr_hb => $::INVR_HB,
321 ); 326 );
… …
518 523
519 $::GAUGES->{hp} ->set_value ($hp, $hp_m); 524 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
520 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 525 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
521 $::GAUGES->{food} ->set_value ($fo, $fo_m); 526 $::GAUGES->{food} ->set_value ($fo, $fo_m);
522 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 527 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
523 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 528 $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
524 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 529 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
525 $::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});
526 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 531 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
527 my $title = $stats->{+CS_STAT_TITLE}; 532 my $title = $stats->{+CS_STAT_TITLE};
528 $title =~ s/^Player: //; 533 $title =~ s/^Player: //;
529 $::STATWIDS->{title} ->set_text ("Title: " . $title); 534 $::STATWIDS->{title} ->set_text ("Title: " . $title);
530 535
… …
643 my $sw = $self->{skillwid}{$idx}; 648 my $sw = $self->{skillwid}{$idx};
644 $sw->[0]->set_text (::formsep ($val->[1])); 649 $sw->[0]->set_text (::formsep ($val->[1]));
645 $sw->[1]->set_text ($val->[0] * 1); 650 $sw->[1]->set_text ($val->[0] * 1);
646 $sw->[2]->set_value (@$val); 651 $sw->[2]->set_value (@$val);
647 652
648 $::GAUGES->{sklprg}->set_label ("$name %d%%"); 653 $::GAUGES->{skillexp}->set_label ("$name %d%%");
649 $::GAUGES->{sklprg}->set_value (@$val); 654 $::GAUGES->{skillexp}->set_value (@$val);
650 } 655 }
651} 656}
652 657
653sub user_send { 658sub user_send {
654 my ($self, $command) = @_; 659 my ($self, $command) = @_;
… …
1008 my ($self, $num, $cb) = @_; 1013 my ($self, $num, $cb) = @_;
1009 1014
1010 push @{$self->{face_cb}{$num}}, $cb; 1015 push @{$self->{face_cb}{$num}}, $cb;
1011 1016
1012 defined wantarray 1017 defined wantarray
1013 ? DC::guard { 1018 ? Guard::guard {
1014 @{$self->{face_cb}{$num}} 1019 @{$self->{face_cb}{$num}}
1015 = grep $_ != $cb, 1020 = grep $_ != $cb,
1016 @{$self->{face_cb}{$num}}; 1021 @{$self->{face_cb}{$num}};
1017 } 1022 }
1018 : () 1023 : ()
… …
1391 }); 1396 });
1392 1397
1393 $self->update_server_info; 1398 $self->update_server_info;
1394 1399
1395 $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;
1396 $self->send_command ("pickup $::CFG->{pickup}"); 1401 $self->send_pickup ($::CFG->{pickup});
1397 1402
1398 $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]", 1403 $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]",
1399 DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d# 1404 DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d#
1400} 1405}
1401 1406

Diff Legend

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