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.200 by root, Tue Sep 2 04:16:42 2008 UTC vs.
Revision 1.203 by elmex, Sun Sep 21 12:34:14 2008 UTC

… …
11use DC::Pod; 11use DC::Pod;
12use DC::Macro; 12use DC::Macro;
13use DC::Item; 13use DC::Item;
14 14
15use base 'Deliantra::Protocol::Base'; 15use base 'Deliantra::Protocol::Base';
16
17our $TEX_DIALOGUE = new_from_resource DC::Texture
18 "dialogue.png", minify => 1, mipmap => 1;
19
20our $TEX_NOFACE = new_from_resource DC::Texture
21 "noface.png", minify => 1, mipmap => 1;
16 22
17sub new { 23sub new {
18 my ($class, %arg) = @_; 24 my ($class, %arg) = @_;
19 25
20 my $self = $class->SUPER::new (%arg, 26 my $self = $class->SUPER::new (%arg,
… …
67 for values %{delete $ws->{w} || {}}; 73 for values %{delete $ws->{w} || {}};
68 } 74 }
69 75
70 delete $self->{items}; 76 delete $self->{items};
71 $::INV->clear; 77 $::INV->clear;
78 $::INVR->clear;
72 $::INVR_HB->clear; 79 $::INVR_HB->clear;
73 $::FLOORBOX->clear; 80 $::FLOORBOX->clear;
74 }); 81 });
75 82
76 $self->{map_widget}->add_command (@$_) 83 $self->{map_widget}->add_command (@$_)
77 for @cmd_help; 84 for @cmd_help;
78 85
79 { 86 {
80 $self->{dialogue} = my $tex = new_from_file DC::Texture 87 $self->{dialogue} = my $tex = $TEX_DIALOGUE;
81 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
82 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 88 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
83 } 89 }
84 90
85 { 91 {
86 $self->{noface} = my $tex = new_from_file DC::Texture 92 $self->{noface} = my $tex = $TEX_NOFACE;
87 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
88 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 93 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
89 } 94 }
90 95
91 $self->{open_container} = 0; 96 $self->{open_container} = 0;
92 97
… …
1092 1097
1093 ## try to create single paragraphs of multiple lines sent by the server 1098 ## try to create single paragraphs of multiple lines sent by the server
1094 # no longer neecssary with TRT servers 1099 # no longer neecssary with TRT servers
1095 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1100 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1096 1101
1097 for (split /\n/, $text) {
1098 ::message ({ 1102 ::message ({
1099 fg => $fg, 1103 fg => $fg,
1100 markup => $_, 1104 markup => $text,
1101 type => $type, 1105 type => $type,
1102 extra => [@extra], 1106 extra => [@extra],
1103 color_flags => $color, #d# ugly, kill 1107 color_flags => $color, #d# ugly, kill
1104 }); 1108 });
1105 1109
1106 $color &= ~NDI_CLEAR; # only clear once for multiline messages 1110# $color &= ~NDI_CLEAR; # only clear once for multiline messages
1107 # actually, this is an ugly design. _we_ should control the channels, 1111# # actually, this is an ugly design. _we_ should control the channels,
1108 # not some random other widget, as the channels are clearly protocol-specific. 1112# # not some random other widget, as the channels are clearly protocol-specific.
1109 # then we could also react to flags such as CLEAR without resorting to 1113# # then we could also react to flags such as CLEAR without resorting to
1110 # hacks such as color_flags, above. 1114# # hacks such as color_flags, above.
1111 }
1112 1115
1113 $self->{statusbox}->add ($text, 1116 $self->{statusbox}->add ($text,
1114 group => $text, 1117 group => $text,
1115 fg => $fg, 1118 fg => $fg,
1116 timeout => $color >= 2 ? 180 : 10, 1119 timeout => $color >= 2 ? 180 : 10,

Diff Legend

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