ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.56 by root, Fri May 19 23:18:40 2006 UTC vs.
Revision 1.116 by root, Fri Aug 18 01:01:00 2006 UTC

1=head1 NAME 1=head1 NAME
2 2
3CFClient - undocumented utility garbage for our crossfire client 3CFPlus - undocumented utility garbage for our crossfire client
4 4
5=head1 SYNOPSIS 5=head1 SYNOPSIS
6 6
7 use CFClient; 7 use CFPlus;
8 8
9=head1 DESCRIPTION 9=head1 DESCRIPTION
10 10
11=over 4 11=over 4
12 12
13=cut 13=cut
14 14
15package CFClient; 15package CFPlus;
16 16
17BEGIN { 17BEGIN {
18 $VERSION = '0.1'; 18 $VERSION = '0.2';
19 19
20 use XSLoader; 20 use XSLoader;
21 XSLoader::load "CFClient", $VERSION; 21 XSLoader::load "CFPlus", $VERSION;
22} 22}
23
24use utf8;
23 25
24use Carp (); 26use Carp ();
25use AnyEvent (); 27use AnyEvent ();
26use BerkeleyDB; 28use BerkeleyDB;
29use Pod::POM ();
30use Scalar::Util ();
31use Storable (); # finally
27 32
28use CFClient::OpenGL; 33=item guard { BLOCK }
29 34
30our %GL_EXT; 35Returns an object that executes the given block as soon as it is destroyed.
31our $GL_VERSION;
32 36
33our $GL_NPOT; 37=cut
34our $GL_DEBUG = 1;
35 38
36sub gl_init { 39sub guard(&) {
37 $GL_VERSION = gl_version * 1; 40 bless \(my $cb = $_[0]), "CFPlus::Guard"
38 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
39
40 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
41
42 glDisable GL_COLOR_MATERIAL;
43 glShadeModel GL_FLAT;
44 glDisable GL_DITHER;
45 glDisable GL_DEPTH_TEST;
46 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
47
48 CFClient::Texture::restore_state ();
49} 41}
50 42
51sub gl_check { 43sub CFPlus::Guard::DESTROY {
52 return unless $GL_DEBUG; 44 ${$_[0]}->()
45}
53 46
54 if (my $error = glGetError) { 47sub asxml($) {
55 Carp::cluck sprintf "opengl error %x while %s", $error, &sprintf(@_); 48 local $_ = $_[0];
49
50 s/&/&/g;
51 s/>/>/g;
52 s/</&lt;/g;
53
54 $_
55}
56
57package CFPlus::Database;
58
59our @ISA = BerkeleyDB::Btree::;
60
61sub get($$) {
62 my $data;
63
64 $_[0]->db_get ($_[1], $data) == 0
65 ? $data
66 : ()
67}
68
69my %DB_SYNC;
70
71sub put($$$) {
72 my ($db, $key, $data) = @_;
73
74 my $key = $db + 0;
75 Scalar::Util::weaken $db;
76 $DB_SYNC{$key} ||= AnyEvent->timer (after => 5, cb => sub {
77 delete $DB_SYNC{$key};
78 $db->db_sync if $db;
56 } 79 });
80
81 $db->db_put ($key => $data)
57} 82}
83
84package CFPlus;
58 85
59sub find_rcfile($) { 86sub find_rcfile($) {
60 my $path; 87 my $path;
61 88
62 for (grep !ref, @INC) { 89 for (grep !ref, @INC) {
63 $path = "$_/CFClient/resources/$_[0]"; 90 $path = "$_/CFPlus/resources/$_[0]";
64 return $path if -r $path; 91 return $path if -r $path;
65 } 92 }
66 93
67 die "FATAL: can't find required file $_[0]\n"; 94 die "FATAL: can't find required file $_[0]\n";
68} 95}
69 96
97BEGIN {
98 use Crossfire::Protocol::Base ();
99 *to_json = \&Crossfire::Protocol::Base::to_json;
100 *from_json = \&Crossfire::Protocol::Base::from_json;
101}
102
70sub read_cfg { 103sub read_cfg {
71 my ($file) = @_; 104 my ($file) = @_;
72 105
73 open CFG, $file 106 open my $fh, $file
74 or return; 107 or return;
75 108
76 my $CFG;
77
78 local $/; 109 local $/;
79 $CFG = eval <CFG>; 110 my $CFG = <$fh>;
80 111
81 $::CFG = $CFG; 112 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
82 113 require YAML;
83 close CFG; 114 utf8::decode $CFG;
115 $::CFG = YAML::Load ($CFG);
116 } elsif ($CFG =~ /^\{/) {
117 $::CFG = from_json $CFG;
118 } else {
119 $::CFG = eval $CFG; ## todo comaptibility cruft
120 }
84} 121}
85 122
86sub write_cfg { 123sub write_cfg {
87 my ($file) = @_; 124 my ($file) = @_;
88 125
89 open CFG, ">$file" 126 $::CFG->{VERSION} = $::VERSION;
127
128 open my $fh, ">:utf8", $file
90 or return; 129 or return;
91 130 print $fh to_json $::CFG;
92 {
93 require Data::Dumper;
94 local $Data::Dumper::Purity = 1;
95 $::CFG->{VERSION} = $::VERSION;
96 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
97 }
98
99 close CFG;
100} 131}
101 132
133our $DB_ENV;
134
135{
136 use strict;
137
102mkdir "$Crossfire::VARDIR/pclient", 0777; 138 mkdir "$Crossfire::VARDIR/cfplus", 0777;
139 my $recover = $BerkeleyDB::db_version >= 4.4
140 ? eval "DB_REGISTER | DB_RECOVER"
141 : 0;
103 142
104our $DB_ENV = new BerkeleyDB::Env 143 $DB_ENV = new BerkeleyDB::Env
105 -Home => "$Crossfire::VARDIR/pclient", 144 -Home => "$Crossfire::VARDIR/cfplus",
106 -Cachesize => 1_000_000, 145 -Cachesize => 1_000_000,
107 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt", 146 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
108# -ErrPrefix => "DATABASE", 147# -ErrPrefix => "DATABASE",
109 -Verbose => 1, 148 -Verbose => 1,
110 -Flags => DB_CREATE | DB_RECOVER_FATAL | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN, 149 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
150 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
111 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error"; 151 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
152}
112 153
113sub db_table($) { 154sub db_table($) {
114 my ($table) = @_; 155 my ($table) = @_;
115 156
116 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 157 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
117 158
118 new CFClient::Database 159 new CFPlus::Database
119 -Env => $DB_ENV, 160 -Env => $DB_ENV,
120 -Filename => $table, 161 -Filename => $table,
121# -Filename => "database", 162# -Filename => "database",
122# -Subname => $table, 163# -Subname => $table,
123 -Property => DB_CHKSUM, 164 -Property => DB_CHKSUM,
124 -Flags => DB_CREATE | DB_UPGRADE, 165 -Flags => DB_CREATE | DB_UPGRADE,
125 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; 166 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
126} 167}
127 168
128sub pod_to_pango($) { 169package CFPlus::Layout;
129 my ($pom) = @_;
130 170
131 $pom->present ("CFClient::PodToPango") 171$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
132} 172 reset_glyph_cache;
133
134package CFClient::PodToPango;
135
136use base Pod::POM::View::Text;
137
138our $indent = 0;
139
140*view_seq_code =
141*view_seq_bold = sub { "<b>$_[1]</b>" };
142*view_seq_italic = sub { "<i>$_[1]</i>" };
143*view_seq_space =
144*view_seq_link =
145*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
146
147sub view_seq_text {
148 my $text = $_[1];
149 $text =~ s/\s+/ /g;
150 CFClient::UI::Label::escape ($text)
151}
152
153sub view_item {
154 ("\t" x ($indent / 4))
155 . $_[1]->title->present ($_[0])
156 . "\n"
157 . $_[1]->content->present ($_[0])
158}
159
160sub view_verbatim {
161 (join "",
162 map +("\t" x ($indent / 2)) . "$_\n",
163 split /\n/, CFClient::UI::Label::escape ($_[1]))
164 . "\n"
165}
166
167sub view_textblock {
168 ("\t" x ($indent / 2)) . "$_[1]\n\n"
169}
170
171sub view_head2 {
172 "<big>" . $_[1]->title->present ($_[0]) . "</big>\n\n"
173 . $_[1]->content->present ($_[0])
174}; 173};
175 174
176sub view_over { 175package CFPlus::Item;
177 local $indent = $indent + $_[1]->indent;
178 $_[1]->content->present ($_[0])
179}
180
181package CFClient::Database;
182
183our @ISA = BerkeleyDB::Btree::;
184
185sub get($$) {
186 my $data;
187
188 $_[0]->db_get ($_[1], $data) == 0
189 ? $data
190 : ()
191}
192
193my %DB_SYNC;
194
195sub put($$$) {
196 my ($db, $key, $data) = @_;
197
198 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
199
200 $db->db_put ($key => $data)
201}
202
203package CFClient::Texture;
204 176
205use strict; 177use strict;
178use Crossfire::Protocol::Constants;
206 179
207use Scalar::Util; 180my $last_enter_count = 1;
208 181
209use CFClient::OpenGL; 182sub desc_string {
210
211my %TEXTURES;
212
213sub new {
214 my ($class, %data) = @_;
215
216 my $self = bless {
217 internalformat => GL_RGBA,
218 format => GL_RGBA,
219 type => GL_UNSIGNED_BYTE,
220 %data,
221 }, $class;
222
223 Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
224
225 $self->upload;
226
227 $self
228}
229
230sub new_from_image {
231 my ($class, $image, %arg) = @_;
232
233 $class->new (image => $image, %arg)
234}
235
236sub new_from_file {
237 my ($class, $path, %arg) = @_;
238
239 open my $fh, "<:raw", $path
240 or die "$path: $!";
241
242 local $/;
243 $class->new_from_image (<$fh>, %arg)
244}
245
246#sub new_from_surface {
247# my ($class, $surface) = @_;
248#
249# $surface->rgba;
250#
251# $class->new (
252# data => $surface->pixels,
253# w => $surface->width,
254# h => $surface->height,
255# )
256#}
257
258sub new_from_layout {
259 my ($class, $layout, %arg) = @_;
260
261 my ($w, $h, $data, $format, $internalformat) = $layout->render;
262
263 $class->new (
264 w => $w,
265 h => $h,
266 data => $data,
267 format => $format,
268 internalformat => $format,
269 type => GL_UNSIGNED_BYTE,
270 %arg,
271 )
272}
273
274sub new_from_opengl {
275 my ($class, $w, $h, $cb) = @_;
276
277 $class->new (w => $w || 1, h => $h || 1, render_cb => $cb)
278}
279
280sub topot {
281 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
282}
283
284sub upload {
285 my ($self) = @_; 183 my ($self) = @_;
286 184
287 return unless $GL_VERSION; 185 my $desc =
186 $self->{nrof} < 2
187 ? $self->{name}
188 : "$self->{nrof} × $self->{name_pl}";
288 189
289 my $data; 190 $self->{flags} & F_OPEN
191 and $desc .= " (open)";
192 $self->{flags} & F_APPLIED
193 and $desc .= " (applied)";
194 $self->{flags} & F_UNPAID
195 and $desc .= " (unpaid)";
196 $self->{flags} & F_MAGIC
197 and $desc .= " (magic)";
198 $self->{flags} & F_CURSED
199 and $desc .= " (cursed)";
200 $self->{flags} & F_DAMNED
201 and $desc .= " (damned)";
202 $self->{flags} & F_LOCKED
203 and $desc .= " *";
290 204
291 if (exists $self->{data}) { 205 $desc
292 $data = $self->{data}; 206}
293 207
294 } elsif (exists $self->{render_cb}) { 208sub weight_string {
295 glViewport 0, 0, $self->{w}, $self->{h}; 209 my ($self) = @_;
296 glMatrixMode GL_PROJECTION;
297 glLoadIdentity;
298 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
299 glMatrixMode GL_MODELVIEW;
300 glLoadIdentity;
301 $self->{render_cb}->($self, $self->{w}, $self->{h});
302 210
303 } else { 211 my $weight = ($self->{nrof} || 1) * $self->{weight};
304 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type}) 212
305 = CFClient::load_image_inline $self->{image}; 213 $weight < 0 ? "?" : $weight * 0.001
214}
215
216sub do_n_dialog {
217 my ($cb) = @_;
218
219 my $w = new CFPlus::UI::Toplevel
220 on_delete => sub { $_[0]->destroy; 1 },
221 has_close_button => 1,
306 } 222 ;
307 223
308 my ($tw, $th) = @$self{qw(w h)}; 224 $w->add (my $vb = new CFPlus::UI::VBox x => "center", y => "center");
225 $vb->add (new CFPlus::UI::Label text => "Enter item count:");
226 $vb->add (my $entry = new CFPlus::UI::Entry
227 text => $last_enter_count,
228 on_activate => sub {
229 my ($entry) = @_;
230 $last_enter_count = $entry->get_text;
231 $cb->($last_enter_count);
232 $w->hide;
233 $w->destroy;
309 234
310 unless ($tw > 0 && $th > 0) { 235 0
311 $tw = $th = 1; 236 },
312 $data = "\x00" x 64; 237 on_escape => sub { $w->destroy; 1 },
313 } 238 );
239 $entry->grab_focus;
240 $w->show;
241}
314 242
315 $self->{minified} = [CFClient::average $tw, $th, $data] 243sub update_widgets {
316 if $self->{minify}; 244 my ($self) = @_;
317 245
318 unless ($GL_NPOT) { 246 # necessary to avoid cyclic references
319 # TODO: does not work for zero-sized textures 247 Scalar::Util::weaken $self;
320 $tw = topot $tw;
321 $th = topot $th;
322 248
323 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) { 249 my $button_cb = sub {
324 my $bpp = (length $data) / ($self->{w} * $self->{h}); 250 my (undef, $ev, $x, $y) = @_;
325 $data = pack "(a" . ($tw * $bpp) . ")*", 251
326 unpack "(a" . ($self->{w} * $bpp) . ")*", $data; 252 my $targ = $::CONN->{player}{tag};
327 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); 253
254 if ($self->{container} == $::CONN->{player}{tag}) {
255 $targ = $::CONN->{open_container};
328 } 256 }
257
258 if (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 1) {
259 $::CONN->send ("move $targ $self->{tag} 0")
260 if $targ || !($self->{flags} & F_LOCKED);
261 } elsif (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 2) {
262 $self->{flags} & F_LOCKED
263 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
264 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
265 } elsif ($ev->{button} == 1) {
266 $::CONN->send ("examine $self->{tag}");
267 } elsif ($ev->{button} == 2) {
268 $::CONN->send ("apply $self->{tag}");
269 } elsif ($ev->{button} == 3) {
270 my $move_prefix = $::CONN->{open_container} ? 'put' : 'drop';
271 if ($self->{container} == $::CONN->{open_container}) {
272 $move_prefix = "take";
273 }
274
275 my @menu_items = (
276 ["examine", sub { $::CONN->send ("examine $self->{tag}") }],
277 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
278 ["ignite/thaw", # first try of an easier use of flint&steel
279 sub {
280 $::CONN->send ("mark ". pack "N", $self->{tag});
281 $::CONN->send ("command apply flint and steel");
282 }
283 ],
284 ["inscribe", # first try of an easier use of flint&steel
285 sub {
286 &::open_string_query ("Text to inscribe", sub {
287 my ($entry, $txt) = @_;
288 $::CONN->send ("mark ". pack "N", $self->{tag});
289 $::CONN->send ("command use_skill inscription $txt");
290 });
291 }
292 ],
293 ["rename", # first try of an easier use of flint&steel
294 sub {
295 &::open_string_query ("Rename item to:", sub {
296 my ($entry, $txt) = @_;
297 $::CONN->send ("mark ". pack "N", $self->{tag});
298 $::CONN->send ("command rename to <$txt>");
299 }, $self->{name},
300 "If you input no name or erase the current custom name, the custom name will be unset");
301 }
302 ],
303 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
304 (
305 $self->{flags} & F_LOCKED
306 ? (
307 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
308 )
309 : (
310 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
311 ["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }],
312 ["$move_prefix &lt;n&gt;",
313 sub {
314 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
315 }
316 ]
317 )
318 ),
319 );
320
321 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
322 }
323
324 1
329 } 325 };
330 326
331 $self->{s} = $self->{w} / $tw; 327 my $tooltip_std = "<small>"
332 $self->{t} = $self->{h} / $th; 328 . "Left click - examine item\n"
329 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
330 . "Middle click - apply\n"
331 . "Shift-Middle click - lock/unlock\n"
332 . "Right click - further options"
333 . "</small>\n";
333 334
334 $self->{name} ||= glGenTexture; 335 my $bg = $self->{flags} & F_CURSED ? [1 , 0 , 0, 0.5]
336 : $self->{flags} & F_MAGIC ? [0.2, 0.2, 1, 0.5]
337 : undef;
335 338
336 glBindTexture GL_TEXTURE_2D, $self->{name}; 339 $self->{face_widget} ||= new CFPlus::UI::Face
337 340 can_events => 1,
338 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; 341 can_hover => 1,
339 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; 342 anim => $self->{anim},
340 343 animspeed => $self->{animspeed}, # TODO# must be set at creation time
341 if ($::FAST) { 344 on_button_down => $button_cb,
342 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
343 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
344 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
345 # alternatively check for 0x8191
346 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
347 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
348 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
349 } else {
350 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
351 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
352 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
353 } 345 ;
346 $self->{face_widget}{bg} = $bg;
347 $self->{face_widget}{face} = $self->{face};
348 $self->{face_widget}{anim} = $self->{anim};
349 $self->{face_widget}{animspeed} = $self->{animspeed};
350 $self->{face_widget}->set_tooltip (
351 "<b>Face/Animation.</b>\n"
352 . "Item uses face #$self->{face}. "
353 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
354 . "\n\n$tooltip_std"
355 );
354 356
355 glGetError; 357 $self->{desc_widget} ||= new CFPlus::UI::Label
356 358 can_events => 1,
357 if (defined $data) { 359 can_hover => 1,
358 glTexImage2D GL_TEXTURE_2D, 0, 360 ellipsise => 2,
359 $self->{internalformat}, 361 align => -1,
360 $tw, $th, 362 on_button_down => $button_cb,
361 0,
362 $self->{format},
363 $self->{type},
364 $data;
365 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
366 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
367 } else {
368 glCopyTexImage2D GL_TEXTURE_2D, 0,
369 $self->{internalformat},
370 0, 0,
371 $tw, $th,
372 0;
373 CFClient::gl_check "copying to texture %dx%d if=%x",
374 $tw, $th, $self->{internalformat};
375 } 363 ;
364 my $desc = CFPlus::Item::desc_string $self;
365 $self->{desc_widget}{bg} = $bg;
366 $self->{desc_widget}->set_text ($desc);
367 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
376 368
377 glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side 369 $self->{weight_widget} ||= new CFPlus::UI::Label
378} 370 can_events => 1,
379 371 can_hover => 1,
380sub DESTROY { 372 ellipsise => 0,
381 my ($self) = @_; 373 align => 0,
382 374 on_button_down => $button_cb,
383 delete $TEXTURES{$self+0}; 375 ;
384 376 $self->{weight_widget}{bg} = $bg;
385 glDeleteTexture delete $self->{name} 377 $self->{weight_widget}->set_text (CFPlus::Item::weight_string $self);
386 if $self->{name}; 378 $self->{weight_widget}->set_tooltip (
387} 379 "<b>Weight</b>.\n"
388 380 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
389sub restore_state { 381 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
390 $_->upload 382 . "\n\n$tooltip_std"
391 for values %TEXTURES; 383 );
392} 384}
393 385
3941; 3861;
395 387
396=back 388=back

Diff Legend

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