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.72 by root, Sun Aug 13 02:43:22 2006 UTC vs.
Revision 1.78 by elmex, Mon Aug 14 14:35:31 2006 UTC

… …
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
… …
56} 57}
57 58
58sub logprint { 59sub logprint {
59 my ($self, @a) = @_; 60 my ($self, @a) = @_;
60 61
62 return;
61 $self->{log_fh} ||= do { 63 $self->{log_fh} ||= do {
62 my $path = "$Crossfire::VARDIR/log.$self->{host}"; 64 my $path = "$Crossfire::VARDIR/log.$self->{host}";
63 65
64 open my $fh, ">>:utf8", $path 66 open my $fh, ">>:utf8", $path
65 or die "Couldn't open logfile $path: $!"; 67 or die "Couldn't open logfile $path: $!";
… …
258 260
259 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 261 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
260 262
261 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 263 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); 264 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 265
265 my ($x, $y) = (0, 1); 266 my ($x, $y) = (0, 1);
266 for ( 267 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 268 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 269 map [$_, $self->{skill_info}{$_}],
… …
294 295
295 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 296 $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); 297 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 298 $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); 299 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); 300 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
301 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
300 302
301 $x++ and ($x, $y) = (0, $y + 1); 303 $x++ and ($x, $y) = (0, $y + 1);
302 } 304 }
303 } 305 }
304 306
… …
929 $self->SUPER::destroy; 931 $self->SUPER::destroy;
930} 932}
931 933
932package CFPlus::NPCDialog; 934package CFPlus::NPCDialog;
933 935
934our @ISA = 'CFPlus::UI::FancyFrame'; 936our @ISA = 'CFPlus::UI::Toplevel';
935 937
936sub new { 938sub new {
937 my $class = shift; 939 my $class = shift;
938 940
939 my $self = $class->SUPER::new ( 941 my $self = $class->SUPER::new (
… …
958 960
959 $hbox->add (my $vbox = new CFPlus::UI::VBox); 961 $hbox->add (my $vbox = new CFPlus::UI::VBox);
960 962
961 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 963 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
962 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 964 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
963 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 965 tooltip => "#npc_message_entry",
964 . "Sometimes you have to tell an NPC something you cannot find out during "
965 . "a normal conversation (such as a password). In those cases you have to use "
966 . "this text entry. You can also enter responses manually instead of using the response "
967 . "buttons below.",
968 on_activate => sub { 966 on_activate => sub {
969 my ($entry, $text) = @_; 967 my ($entry, $text) = @_;
970 968
971 return unless $text =~ /\S/; 969 return unless $text =~ /\S/;
972 970
… …
1047 padding_y => 0, 1045 padding_y => 0,
1048 on_button_up => sub { 1046 on_button_up => sub {
1049 $self->send ($kw); 1047 $self->send ($kw);
1050 }; 1048 };
1051 1049
1052 chr 0xfffc 1050 "\x{fffc}"
1053 }giex; 1051 }giex;
1054 1052
1055 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1053 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1056 $self->{textview}->scroll_to_bottom; 1054 $self->{textview}->scroll_to_bottom;
1057 $self->update_options; 1055 $self->update_options;

Diff Legend

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