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.73 by root, Sun Aug 13 15:14:17 2006 UTC vs.
Revision 1.83 by root, Tue Sep 19 22:02:38 2006 UTC

… …
12use base 'Crossfire::Protocol::Base'; 12use base 'Crossfire::Protocol::Base';
13 13
14sub new { 14sub new {
15 my $class = shift; 15 my $class = shift;
16 16
17 my $self = $class->SUPER::new (@_); 17 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
18 18
19 $self->{map_widget}->clr_commands; 19 $self->{map_widget}->clr_commands;
20 20
21 my @cmd_help = map { 21 my @cmd_help = map {
22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
33 for @args; 33 for @args;
34 34
35 map ["$cmd$_", $text], 35 map ["$cmd$_", $text],
36 sort { (length $a) <=> (length $b) } 36 sort { (length $a) <=> (length $b) }
37 @args 37 @args
38 } sort { $a->{par} <=> $b->{par} }
38 } CFPlus::Pod::find command_help => "*"; 39 CFPlus::Pod::find command => "*";
39 40
40 $self->{map_widget}->add_command (@$_) 41 $self->{map_widget}->add_command (@$_)
41 for @cmd_help; 42 for @cmd_help;
42 43
43 $self->{noface} = new_from_file CFPlus::Texture 44 $self->{noface} = new_from_file CFPlus::Texture
44 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 45 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
45 46
47 {
48 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
49 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
50 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
51 }
52
46 $self->{open_container} = 0; 53 $self->{open_container} = 0;
47 54
48 # "global" 55 # "global"
49 $self->{tilecache} = CFPlus::db_table "tilecache"; 56 $self->{tilecache} = CFPlus::db_table "tilecache"
57 or die "tilecache: unable to open database table";
50 $self->{facemap} = CFPlus::db_table "facemap"; 58 $self->{facemap} = CFPlus::db_table "facemap"
59 or die "facemap: unable to open database table";
51 60
52 # per server 61 # per server
53 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 62 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"
63 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
54 64
55 $self 65 $self
56} 66}
57 67
58sub logprint { 68sub logprint {
… …
258 268
259 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 269 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
260 270
261 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 271 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
262 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 272 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
263 my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
264 273
265 my ($x, $y) = (0, 1); 274 my ($x, $y) = (0, 1);
266 for ( 275 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 276 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 277 map [$_, $self->{skill_info}{$_}],
… …
294 303
295 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 304 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
296 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 305 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
297 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 306 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
298 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 307 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
299 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME); 308 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
309 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
300 310
301 $x++ and ($x, $y) = (0, $y + 1); 311 $x++ and ($x, $y) = (0, $y + 1);
302 } 312 }
303 } 313 }
304 314
… …
338} 348}
339 349
340sub feed_map1a { 350sub feed_map1a {
341 my ($self, $data) = @_; 351 my ($self, $data) = @_;
342 352
343 $self->{map}->map1a_update ($data); 353 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
344 $self->{map_widget}->update; 354 $self->{map_widget}->update;
345} 355}
346 356
347sub magicmap { 357sub magicmap {
348 my ($self, $w, $h, $x, $y, $data) = @_; 358 my ($self, $w, $h, $x, $y, $data) = @_;
… …
873 $::SERVER_INFO->set_markup ( 883 $::SERVER_INFO->set_markup (
874 "server <tt>$self->{host}:$self->{port}</tt>\n" 884 "server <tt>$self->{host}:$self->{port}</tt>\n"
875 . "protocol version <tt>$self->{version}</tt>\n" 885 . "protocol version <tt>$self->{version}</tt>\n"
876 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 886 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
877 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 887 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
888 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
878 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 889 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
879 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 890 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
880 . "map size $self->{mapw}×$self->{maph}\n" 891 . "map size $self->{mapw}×$self->{maph}\n"
881 ); 892 );
882} 893}
… …
921} 932}
922 933
923sub destroy { 934sub destroy {
924 my ($self) = @_; 935 my ($self) = @_;
925 936
926 $self->{npc_dialog}->destroy 937 (delete $self->{npc_dialog})->destroy
927 if $self->{npc_dialog}; 938 if $self->{npc_dialog};
928 939
929 $self->SUPER::destroy; 940 $self->SUPER::destroy;
930} 941}
931 942
932package CFPlus::NPCDialog; 943package CFPlus::NPCDialog;
933 944
934our @ISA = 'CFPlus::UI::FancyFrame'; 945our @ISA = 'CFPlus::UI::Toplevel';
935 946
936sub new { 947sub new {
937 my $class = shift; 948 my $class = shift;
938 949
939 my $self = $class->SUPER::new ( 950 my $self = $class->SUPER::new (
… …
1043 padding_y => 0, 1054 padding_y => 0,
1044 on_button_up => sub { 1055 on_button_up => sub {
1045 $self->send ($kw); 1056 $self->send ($kw);
1046 }; 1057 };
1047 1058
1048 chr 0xfffc 1059 "\x{fffc}"
1049 }giex; 1060 }giex;
1050 1061
1051 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1062 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1052 $self->{textview}->scroll_to_bottom; 1063 $self->{textview}->scroll_to_bottom;
1053 $self->update_options; 1064 $self->update_options;

Diff Legend

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