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.214 by root, Tue Dec 22 00:35:44 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;
… …
16 18
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, wrap => 1;
22 24
23sub MIN_TEXTURE_UNUSED() { 1 }#d# 25sub MIN_TEXTURE_UNUSED() { 1 }#d#
24 26
25sub new { 27sub new {
26 my ($class, %arg) = @_; 28 my ($class, %arg) = @_;
… …
277 my %wkw = ( 279 my %wkw = (
278 root => $DC::UI::ROOT, 280 root => $DC::UI::ROOT,
279 tooltip => $DC::UI::TOOLTIP, 281 tooltip => $DC::UI::TOOLTIP,
280 282
281 mapwidget => $::MAPWIDGET, 283 mapwidget => $::MAPWIDGET,
284 menubar => $::MENUBAR,
285 menupopup => $::MENUPOPUP,
286 pickup_enable => $::PICKUP_ENABLE,
282 buttonbar => $::BUTTONBAR, 287 buttonbar => $::BUTTONBAR,
283 metaserver => $::METASERVER, 288 metaserver => $::METASERVER,
284 buttonbar => $::BUTTONBAR, 289 buttonbar => $::BUTTONBAR,
285 login_button => $::LOGIN_BUTTON, 290 login_button => $::LOGIN_BUTTON,
286 quit_dialog => $::QUIT_DIALOG, 291 quit_dialog => $::QUIT_DIALOG,
… …
303 308
304 floorbox => $::FLOORBOX, 309 floorbox => $::FLOORBOX,
305 help_window => $::HELP_WINDOW, 310 help_window => $::HELP_WINDOW,
306 message_window => $::MESSAGE_WINDOW, 311 message_window => $::MESSAGE_WINDOW,
307 message_dist => $::MESSAGE_DIST, 312 message_dist => $::MESSAGE_DIST,
308 statusbox => $::SDTATUSBOX, 313 statusbox => $::STATUSBOX,
309 314
310 inv => $::INV, 315 inv => $::INV,
311 invr => $::INVR, 316 invr => $::INVR,
312 invr_hb => $::INVR_HB, 317 invr_hb => $::INVR_HB,
313 ); 318 );
… …
397 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) 402 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
398 : () 403 : ()
399 } 404 }
400 sort { $a <=> $b } keys %{$self->{spell_paths}}; 405 sort { $a <=> $b } keys %{$self->{spell_paths}};
401 406
402 join "", @diff 407 "\u$name: " . (join ", ", @diff)
403} 408}
404 409
405# all stats that are chacked against changes 410# all stats that are chacked against changes
406my @statchange = ( 411my @statchange = (
407 [&CS_STAT_STR => \&_stat_numdiff, "Str"], 412 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
… …
462 } 467 }
463 468
464 if ( 469 if (
465 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 470 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
466 ) { 471 ) {
467 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 472 my $msg = "<b>stat change</b>: " . (join " ", map "($_)", @diffs);
468 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20); 473 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
469 } 474 }
470 475
471 $self->update_stats_window ($stats, $prev); 476 $self->update_stats_window ($stats, $prev);
472 477
… …
510 515
511 $::GAUGES->{hp} ->set_value ($hp, $hp_m); 516 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
512 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 517 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
513 $::GAUGES->{food} ->set_value ($fo, $fo_m); 518 $::GAUGES->{food} ->set_value ($fo, $fo_m);
514 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 519 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
515 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 520 $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
516 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 521 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
517 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); 522 $::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
518 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 523 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
519 my $title = $stats->{+CS_STAT_TITLE}; 524 my $title = $stats->{+CS_STAT_TITLE};
520 $title =~ s/^Player: //; 525 $title =~ s/^Player: //;
521 $::STATWIDS->{title} ->set_text ("Title: " . $title); 526 $::STATWIDS->{title} ->set_text ("Title: " . $title);
522 527
… …
635 my $sw = $self->{skillwid}{$idx}; 640 my $sw = $self->{skillwid}{$idx};
636 $sw->[0]->set_text (::formsep ($val->[1])); 641 $sw->[0]->set_text (::formsep ($val->[1]));
637 $sw->[1]->set_text ($val->[0] * 1); 642 $sw->[1]->set_text ($val->[0] * 1);
638 $sw->[2]->set_value (@$val); 643 $sw->[2]->set_value (@$val);
639 644
640 $::GAUGES->{sklprg}->set_label ("$name %d%%"); 645 $::GAUGES->{skillexp}->set_label ("$name %d%%");
641 $::GAUGES->{sklprg}->set_value (@$val); 646 $::GAUGES->{skillexp}->set_value (@$val);
642 } 647 }
643} 648}
644 649
645sub user_send { 650sub user_send {
646 my ($self, $command) = @_; 651 my ($self, $command) = @_;
… …
985 990
986 my $tex = $self->{texture}[$tile] ||= 991 my $tex = $self->{texture}[$tile] ||=
987 new DC::Texture 992 new DC::Texture
988 tile => $tile, 993 tile => $tile,
989 image => $data, delete_image => 1, 994 image => $data, delete_image => 1,
990 minify => 1, mipmap => 1; 995 minify => 1;
991 996
992 if (my $cbs = delete $self->{tile_cb}{$tile}) { 997 if (my $cbs = delete $self->{tile_cb}{$tile}) {
993 $_->($tex) for @$cbs; 998 $_->($tex) for @$cbs;
994 } 999 }
995} 1000}
… …
1000 my ($self, $num, $cb) = @_; 1005 my ($self, $num, $cb) = @_;
1001 1006
1002 push @{$self->{face_cb}{$num}}, $cb; 1007 push @{$self->{face_cb}{$num}}, $cb;
1003 1008
1004 defined wantarray 1009 defined wantarray
1005 ? DC::guard { 1010 ? Guard::guard {
1006 @{$self->{face_cb}{$num}} 1011 @{$self->{face_cb}{$num}}
1007 = grep $_ != $cb, 1012 = grep $_ != $cb,
1008 @{$self->{face_cb}{$num}}; 1013 @{$self->{face_cb}{$num}};
1009 } 1014 }
1010 : () 1015 : ()
… …
1383 }); 1388 });
1384 1389
1385 $self->update_server_info; 1390 $self->update_server_info;
1386 1391
1387 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1392 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1388 $self->send_command ("pickup $::CFG->{pickup}"); 1393 $self->send_pickup ($::CFG->{pickup});
1389 1394
1390 $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]", 1395 $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]",
1391 DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d# 1396 DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d#
1392} 1397}
1393 1398

Diff Legend

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