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.209 by root, Sun Jan 11 22:11:23 2009 UTC vs.
Revision 1.221 by root, Sun Nov 4 02:13:53 2012 UTC

1package DC::Protocol; 1package DC::Protocol;
2 2
3use utf8; 3use common::sense;
4use strict;
5 4
6use Guard (); 5use Guard ();
7 6
8use Deliantra::Protocol::Constants; 7use Deliantra::Protocol::Constants;
9 8
… …
18 17
19our $TEX_DIALOGUE = new_from_resource DC::Texture 18our $TEX_DIALOGUE = new_from_resource DC::Texture
20 "dialogue.png", minify => 1, mipmap => 1; 19 "dialogue.png", minify => 1, mipmap => 1;
21 20
22our $TEX_NOFACE = new_from_resource DC::Texture 21our $TEX_NOFACE = new_from_resource DC::Texture
23 "noface.png", minify => 1, mipmap => 1; 22 "noface.png", minify => 1, mipmap => 1, wrap => 1;
24
25our $TEX_HIDDEN = new_from_resource DC::Texture
26 "hidden.png", minify => 1, mipmap => 1;
27 23
28sub MIN_TEXTURE_UNUSED() { 1 }#d# 24sub MIN_TEXTURE_UNUSED() { 1 }#d#
29 25
30sub new { 26sub new {
31 my ($class, %arg) = @_; 27 my ($class, %arg) = @_;
32 28
33 my $self = $class->SUPER::new (%arg, 29 my $self = $class->SUPER::new (%arg,
34 setup_req => { 30 setup_req => {
35 extmap => 1, 31 extmap => 1,
36 excmd => 1,
37 widget => 2, 32 widget => 2,
38 %{$arg{setup_req} || {}}, 33 %{$arg{setup_req} || {}},
39 }, 34 },
40 ); 35 );
36
37 $self->update_fx_want;
38
39 my $guard = $self->addme_guard;
40 $self->send_exti_req (resource => "exp_table", sub {
41 my ($idx) = @_;
42
43 $self->register_face_handler ($idx, sub {
44 my ($face) = @_;
45
46 undef $guard;
47 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
48 $_->() for values %{ $self->{on_exp_update} };
49 });
50
51 ()
52 });
53
54 my $guard = $self->addme_guard;
55 $self->send_exti_req (resource => "skill_info", sub {
56 my ($idx) = @_;
57
58 $self->register_face_handler ($idx, sub {
59 my ($face) = @_;
60
61 undef $guard;
62 my $info = $self->{json_coder}->decode (delete $face->{data});
63 $self->{skill_info} = { map { CS_STAT_SKILLINFO + $_ => $info->[$_][0] } 0 .. $#$info };
64 });
65
66 ()
67 });
68
69 my $guard = $self->addme_guard;
70 $self->send_exti_req (resource => "spell_paths", sub {
71 my ($idx) = @_;
72
73 $self->register_face_handler ($idx, sub {
74 my ($face) = @_;
75
76 undef $guard;
77 my $info = $self->{json_coder}->decode (delete $face->{data});
78 $self->{spell_paths} = { map { (1 << $_) => $info->[$_][0] } 0 .. $#$info };
79 });
80
81 ()
82 });
41 83
42 $self->{map_widget}->clr_commands; 84 $self->{map_widget}->clr_commands;
43 85
44 my @cmd_help = map { 86 my @cmd_help = map {
45 $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 87 $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
98 { 140 {
99 $self->{noface} = my $tex = $TEX_NOFACE; 141 $self->{noface} = my $tex = $TEX_NOFACE;
100 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 142 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
101 } 143 }
102 144
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 145# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id
109# $self->{expire_w} = EV::timer 1, 1, sub { 146# $self->{expire_w} = AE::timer 1, 1, sub {
110# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1; 147# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1;
111# 148#
112# for ($self->{map}->expire_textures ($self->{expire_count}, $count)) { 149# for ($self->{map}->expire_textures ($self->{expire_count}, $count)) {
113# warn DC::SvREFCNT $self->{texture}[$_]; 150# warn DC::SvREFCNT $self->{texture}[$_];
114# $self->{texture}[$_]->unload; 151# $self->{texture}[$_]->unload;
… …
139} 176}
140 177
141sub ext_capabilities { 178sub ext_capabilities {
142 my ($self, %cap) = @_; 179 my ($self, %cap) = @_;
143 180
144 $self->update_fx_want;
145
146 $self->send_exti_req (resource => "exp_table", sub {
147 my ($exp_table) = @_;
148
149 $self->register_face_handler ($exp_table, sub {
150 my ($face) = @_;
151
152 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
153 $_->() for values %{ $self->{on_exp_update} || {} };
154 });
155
156 ()
157 });
158
159 if (my $ts = $cap{tileset}) { 181 if (my $ts = $cap{tileset}) {
160 if (my ($default) = grep $_->[2] & 1, @$ts) { 182 if (my ($default) = grep $_->[2] & 1, @$ts) {
161 $self->{tileset} = $default; 183 $self->{tileset} = $default;
162 $self->{tilesize} = $default->[3]; 184 $self->{tilesize} = $default->[3];
163 $self->setup_req (tileset => $default->[0]); 185 $self->setup_req (tileset => $default->[0]);
… …
410 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) 432 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
411 : () 433 : ()
412 } 434 }
413 sort { $a <=> $b } keys %{$self->{spell_paths}}; 435 sort { $a <=> $b } keys %{$self->{spell_paths}};
414 436
415 join "", @diff 437 "\u$name: " . (join ", ", @diff)
416} 438}
417 439
418# all stats that are chacked against changes 440# all stats that are chacked against changes
419my @statchange = ( 441my @statchange = (
420 [&CS_STAT_STR => \&_stat_numdiff, "Str"], 442 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
… …
463 485
464 if (my @diffs = 486 if (my @diffs =
465 ( 487 (
466 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()), 488 ($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
467 map { 489 map {
468 $stats->{$_} && $prev->{$_} 490 $stats->{$_} && $prev->{$_}
469 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : () 491 && $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
470 } sort { $a <=> $b } keys %{$self->{skill_info}} 492 } sort { $a <=> $b } keys %{$self->{skill_info}}
471 ) 493 )
472 ) { 494 ) {
473 my $msg = join " ", @diffs; 495 my $msg = join " ", @diffs;
… …
475 } 497 }
476 498
477 if ( 499 if (
478 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 500 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
479 ) { 501 ) {
480 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 502 my $msg = "<b>stat change</b>: " . (join " ", map "($_)", @diffs);
481 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20); 503 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
482 } 504 }
483 505
484 $self->update_stats_window ($stats, $prev); 506 $self->update_stats_window ($stats, $prev);
485 507
… …
547 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 569 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
548 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 570 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
549 571
550 $self->update_weight; 572 $self->update_weight;
551 573
552 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 574 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%%", $stats->{$RES_TBL{$_}})
553 for keys %RES_TBL; 575 for keys %RES_TBL;
554 576
555 my $sktbl = $::STATWIDS->{skill_tbl}; 577 my $sktbl = $::STATWIDS->{skill_tbl};
556 my @skills = keys %{ $self->{skill_info} }; 578 my @skills = keys %{ $self->{skill_info} };
557 579
… …
678} 700}
679 701
680sub feed_map1a { 702sub feed_map1a {
681 my ($self, $data) = @_; 703 my ($self, $data) = @_;
682 704
683 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 705 my $missing = $self->{map}->map1a_update ($data);
684 my $delay; 706 my $delay;
685 707
686 for my $tile (@$missing) { 708 for my $tile (@$missing) {
687 next if $self->{delay}{$tile}; 709 next if $self->{delay}{$tile};
688 710
… …
998 1020
999 my $tex = $self->{texture}[$tile] ||= 1021 my $tex = $self->{texture}[$tile] ||=
1000 new DC::Texture 1022 new DC::Texture
1001 tile => $tile, 1023 tile => $tile,
1002 image => $data, delete_image => 1, 1024 image => $data, delete_image => 1,
1003 minify => 1, mipmap => 1; 1025 minify => 1;
1004 1026
1005 if (my $cbs = delete $self->{tile_cb}{$tile}) { 1027 if (my $cbs = delete $self->{tile_cb}{$tile}) {
1006 $_->($tex) for @$cbs; 1028 $_->($tex) for @$cbs;
1007 } 1029 }
1008} 1030}
… …
1051 my ($self, $flags, $prompt) = @_; 1073 my ($self, $flags, $prompt) = @_;
1052 1074
1053 $prompt = $LAST_QUERY unless length $prompt; 1075 $prompt = $LAST_QUERY unless length $prompt;
1054 $LAST_QUERY = $prompt; 1076 $LAST_QUERY = $prompt;
1055 1077
1056 $self->{query}-> ($self, $flags, $prompt); 1078 $self->{query}->($self, $flags, $prompt);
1057} 1079}
1058 1080
1059sub sanitise_xml($) { 1081sub sanitise_xml($) {
1060 local $_ = shift; 1082 local $_ = shift;
1061 1083
… …
1123 $self->logprint ("msg: ", $text); 1145 $self->logprint ("msg: ", $text);
1124 return if $color < 0; # negative color == ignore if not understood 1146 return if $color < 0; # negative color == ignore if not understood
1125 1147
1126 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0]; 1148 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
1127 1149
1128 ## try to create single paragraphs of multiple lines sent by the server
1129 # no longer neecssary with TRT servers
1130 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1131
1132 ::message ({ 1150 ::message ({
1133 fg => $fg, 1151 fg => $fg,
1134 markup => $text, 1152 markup => $text,
1135 type => $type, 1153 type => $type,
1136 extra => [@extra], 1154 extra => [@extra],
… …
1356sub update_server_info { 1374sub update_server_info {
1357 my ($self) = @_; 1375 my ($self) = @_;
1358 1376
1359 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>"); 1377 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
1360 1378
1379 my $version = JSON::XS->new->encode ($self->{s_version});
1380
1361 $::SERVER_INFO->set_markup ( 1381 $::SERVER_INFO->set_markup (
1362 "server <tt>$self->{host}:$self->{port}</tt>\n" 1382 "server <tt>$self->{host}:$self->{port}</tt>\n"
1363 . "protocol version <tt>$self->{version}</tt>\n" 1383 . "protocol version <tt>$version</tt>\n"
1364 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
1365 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1366 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1367 . "editing support $yesno[!!$self->{editor_support}]\n" 1384 . "editing support $yesno[!!$self->{editor_support}]\n"
1368 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1369 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1370 . "client support $yesno[$self->{cfplus_ext} > 0]" 1385 . "client support $yesno[$self->{cfplus_ext} > 0]"
1371 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1386 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1372 . "map size $self->{mapw}×$self->{maph}\n" 1387 . "map size $self->{mapw}×$self->{maph}\n"
1373 ); 1388 );
1374 1389
… …
1397 1412
1398 $self->update_server_info; 1413 $self->update_server_info;
1399 1414
1400 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1415 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1401 $self->send_pickup ($::CFG->{pickup}); 1416 $self->send_pickup ($::CFG->{pickup});
1402
1403 $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]",
1404 DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d#
1405} 1417}
1406 1418
1407sub lookat { 1419sub lookat {
1408 my ($self, $x, $y) = @_; 1420 my ($self, $x, $y) = @_;
1409 1421
… …
1411 $self->send_ext_req (lookat => $x, $y, sub { 1423 $self->send_ext_req (lookat => $x, $y, sub {
1412 my (%msg) = @_; 1424 my (%msg) = @_;
1413 1425
1414 if (exists $msg{npc_dialog}) { 1426 if (exists $msg{npc_dialog}) {
1415 # start npc chat dialog 1427 # start npc chat dialog
1416 $self->{npc_dialog} = new DC::NPCDialog:: 1428 $self->{w}{npc_dialog} = new DC::NPCDialog::
1417 token => $msg{npc_dialog}, 1429 token => $msg{npc_dialog},
1418 title => "$msg{npc_dialog}[0] (NPC)", 1430 title => "$msg{npc_dialog}[0] (NPC)",
1419 conn => $self, 1431 conn => $self,
1420 ; 1432 ;
1421 } 1433 }
… …
1426} 1438}
1427 1439
1428sub destroy { 1440sub destroy {
1429 my ($self) = @_; 1441 my ($self) = @_;
1430 1442
1431 (delete $self->{npc_dialog})->destroy 1443 $_->destroy
1432 if $self->{npc_dialog}; 1444 for values %{ $self->{w} };
1433 1445
1434 $self->SUPER::destroy; 1446 $self->SUPER::destroy;
1435 1447
1436 %$self = (); 1448 %$self = ();
1437} 1449}
… …
1591 1603
1592 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1604 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1593 1605
1594 if ($self->{conn}) { 1606 if ($self->{conn}) {
1595 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id}; 1607 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1596 delete $self->{conn}{npc_dialog}; 1608 delete $self->{conn}{w}{npc_dialog};
1597 $self->{conn}->disconnect_ext ($self->{id}); 1609 $self->{conn}->disconnect_ext ($self->{id});
1598 } 1610 }
1599 1611
1600 $self->SUPER::destroy; 1612 $self->SUPER::destroy;
1601} 1613}

Diff Legend

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