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.35 by root, Sat Apr 15 22:55:59 2006 UTC vs.
Revision 1.74 by elmex, Mon May 29 19:49:33 2006 UTC

19 19
20 use XSLoader; 20 use XSLoader;
21 XSLoader::load "CFClient", $VERSION; 21 XSLoader::load "CFClient", $VERSION;
22} 22}
23 23
24use utf8;
25
26use Carp ();
24use AnyEvent; 27use AnyEvent ();
25use BerkeleyDB; 28use BerkeleyDB;
26use SDL::OpenGL;
27
28our %GL_EXT;
29our $GL_VERSION;
30
31our $GL_NPOT;
32
33sub gl_init {
34 $GL_VERSION = gl_version * 1;
35 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
36
37 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
38
39 glEnable GL_TEXTURE_2D;
40 glEnable GL_COLOR_MATERIAL;
41 glShadeModel GL_FLAT;
42 glDisable GL_DEPTH_TEST;
43 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
44
45 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
46
47 CFClient::Texture::restore_state ();
48}
49 29
50sub find_rcfile($) { 30sub find_rcfile($) {
51 my $path; 31 my $path;
52 32
53 for (@INC) { 33 for (grep !ref, @INC) {
54 $path = "$_/CFClient/resources/$_[0]"; 34 $path = "$_/CFClient/resources/$_[0]";
55 return $path if -r $path; 35 return $path if -r $path;
56 } 36 }
57 37
58 die "FATAL: can't find required file $_[0]\n"; 38 die "FATAL: can't find required file $_[0]\n";
93mkdir "$Crossfire::VARDIR/pclient", 0777; 73mkdir "$Crossfire::VARDIR/pclient", 0777;
94 74
95our $DB_ENV = new BerkeleyDB::Env 75our $DB_ENV = new BerkeleyDB::Env
96 -Home => "$Crossfire::VARDIR/pclient", 76 -Home => "$Crossfire::VARDIR/pclient",
97 -Cachesize => 1_000_000, 77 -Cachesize => 1_000_000,
98 -ErrFile => "/proc/self/fd/2", 78 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
99 -ErrPrefix => "DATABASE", 79# -ErrPrefix => "DATABASE",
100 -Verbose => 1, 80 -Verbose => 1,
101 -Flags => DB_CREATE | DB_JOINENV | DB_RECOVER_FATAL | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN, 81 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN,
102 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error"; 82 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";
103 83
104sub db_table($) { 84sub db_table($) {
85 my ($table) = @_;
86
87 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
88
105 new CFClient::Database 89 new CFClient::Database
106 -Env => $DB_ENV, 90 -Env => $DB_ENV,
91 -Filename => $table,
107 -Filename => "database", 92# -Filename => "database",
108 -Subname => $_[0], 93# -Subname => $table,
94 -Property => DB_CHKSUM,
109 -Flags => DB_CREATE | DB_UPGRADE, 95 -Flags => DB_CREATE | DB_UPGRADE,
110 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; 96 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
111} 97}
112 98
99sub pod_to_pango($) {
100 my ($pom) = @_;
101
102 $pom->present ("CFClient::PodToPango")
103}
104
105sub pod_to_pango_list($) {
106 my ($pom) = @_;
107
108 [
109 map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
110 split /\n/, $pom->present ("CFClient::PodToPango")
111 ]
112}
113
114package CFClient::PodToPango;
115
116use base Pod::POM::View::Text;
117
118our $indent = 0;
119
120*view_seq_code =
121*view_seq_bold = sub { "<b>$_[1]</b>" };
122*view_seq_italic = sub { "<i>$_[1]</i>" };
123*view_seq_space =
124*view_seq_link =
125*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
126
127sub view_seq_text {
128 my $text = $_[1];
129 $text =~ s/\s+/ /g;
130 CFClient::UI::Label::escape ($text)
131}
132
133sub view_item {
134 ("\t" x ($indent / 4))
135 . $_[1]->title->present ($_[0])
136 . "\n"
137 . $_[1]->content->present ($_[0])
138}
139
140sub view_verbatim {
141 (join "",
142 map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
143 split /\n/, CFClient::UI::Label::escape ($_[1]))
144 . "\n"
145}
146
147sub view_textblock {
148 ("\t" x ($indent / 2)) . "$_[1]\n\n"
149}
150
151sub view_head1 {
152 "\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
153 . $_[1]->content->present ($_[0])
154};
155
156sub view_head2 {
157 "\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
158 . $_[1]->content->present ($_[0])
159};
160
161sub view_head3 {
162 "\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
163 . $_[1]->content->present ($_[0])
164};
165
166sub view_over {
167 local $indent = $indent + $_[1]->indent;
168 $_[1]->content->present ($_[0])
169}
170
113package CFClient::Database; 171package CFClient::Database;
114 172
115our @ISA = BerkeleyDB::Btree::; 173our @ISA = BerkeleyDB::Btree::;
116 174
117sub get($$) { 175sub get($$) {
118 my $data; 176 my $data;
119 177
120 $_[0]->db_get ($_[1], $data) == 0 178 $_[0]->db_get ($_[1], $data) == 0
121 ? $data 179 ? $data
122 : (); 180 : ()
123} 181}
124 182
125my %DB_SYNC; 183my %DB_SYNC;
126 184
127sub put($$$) { 185sub put($$$) {
128 my ($db, $key, $data) = @_; 186 my ($db, $key, $data) = @_;
129 187
130 $db->db_put ($key => $data);
131
132 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync }); 188 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
189
190 $db->db_put ($key => $data)
191}
192
193package CFClient::Item;
194
195use strict;
196use Crossfire::Protocol::Constants;
197
198sub desc_string {
199 my ($self) = @_;
200
201 my $desc =
202 $self->{nrof} < 2
203 ? $self->{name}
204 : "$self->{nrof} × $self->{name_pl}";
205
206 $self->{flags} & F_OPEN
207 and $desc .= " (open)";
208 $self->{flags} & F_APPLIED
209 and $desc .= " (applied)";
210 $self->{flags} & F_UNPAID
211 and $desc .= " (unpaid)";
212 $self->{flags} & F_MAGIC
213 and $desc .= " (magic)";
214 $self->{flags} & F_CURSED
215 and $desc .= " (cursed)";
216 $self->{flags} & F_DAMNED
217 and $desc .= " (damned)";
218 $self->{flags} & F_LOCKED
219 and $desc .= " *";
220
221 $desc
222}
223
224sub weight_string {
225 my ($self) = @_;
226
227 my $weight = ($self->{nrof} || 1) * $self->{weight};
228
229 $weight < 0 ? "?" : $weight * 0.001
230}
231
232sub update_widgets {
233 my ($self) = @_;
234
235 my $button_cb = sub {
236 my (undef, $ev, $x, $y) = @_;
237
238 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
239 my $targ = $::CONN->{player}{tag};
240
241 if ($self->{container} == $::CONN->{player}{tag}) {
242 $targ = $::CONN->{open_container};
243 }
244
245 $::CONN->send ("move $targ $self->{tag} 0");
246 } elsif ($ev->{button} == 1) {
247 $::CONN->send ("examine $self->{tag}");
248 } elsif ($ev->{button} == 2) {
249 $::CONN->send ("apply $self->{tag}");
250 } elsif ($ev->{button} == 3) {
251 my @menu_items = (
252 ["examine", sub { $::CONN->send ("examine $self->{tag}") }],
253 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
254 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
255 (
256 $self->{flags} & F_LOCKED
257 ? (
258 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
259 )
260 : (
261 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
262 ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
263 )
264 ),
265 );
266
267 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
268 }
269
270 1
271 };
272
273 my $tooltip_std = "<small>"
274 . "Left click - examine item\n"
275 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
276 . "Middle click - apply\n"
277 . "Right click - further options"
278 . "</small>\n";
279
280 $self->{face_widget} ||= new CFClient::UI::Face
281 can_events => 1,
282 can_hover => 1,
283 anim => $self->{anim},
284 animspeed => $self->{animspeed}, # TODO# must be set at creation time
285 on_button_down => $button_cb,
286 ;
287 $self->{face_widget}{face} = $self->{face};
288 $self->{face_widget}{anim} = $self->{anim};
289 $self->{face_widget}{animspeed} = $self->{animspeed};
290 $self->{face_widget}->set_tooltip (
291 "<b>Face/Animation.</b>\n"
292 . "Item uses face #$self->{face}. "
293 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
294 . "\n\n$tooltip_std"
295 );
133 296
134} 297 $self->{desc_widget} ||= new CFClient::UI::Label
298 can_events => 1,
299 can_hover => 1,
300 ellipsise => 2,
301 align => -1,
302 on_button_down => $button_cb,
303 ;
304 my $desc = CFClient::Item::desc_string $self;
305 $self->{desc_widget}->set_text ($desc);
306 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
135 307
136package CFClient::Texture; 308 $self->{weight_widget} ||= new CFClient::UI::Label
309 can_events => 1,
310 can_hover => 1,
311 ellipsise => 0,
312 align => 0,
313 on_button_down => $button_cb,
314 ;
315 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
137 316
138use strict; 317 $self->{weight_widget}->set_tooltip (
139 318 "<b>Weight</b>.\n"
140use Scalar::Util; 319 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
141 320 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
142use SDL::OpenGL; 321 . "\n\n$tooltip_std"
143
144my %TEXTURES;
145my @NAMES;
146
147sub new {
148 my ($class, %data) = @_;
149
150 my $self = bless {
151 internalformat => GL_RGBA,
152 format => GL_RGBA,
153 type => GL_UNSIGNED_BYTE,
154 %data,
155 }, $class;
156
157 Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
158
159 $self->upload;
160
161 $self
162}
163
164sub new_from_image {
165 my ($class, $image, %arg) = @_;
166
167 $class->new (image => $image, %arg)
168}
169
170sub new_from_file {
171 my ($class, $path) = @_;
172
173 open my $fh, "<:raw", $path
174 or die "$path: $!";
175
176 local $/;
177 $class->new_from_image (<$fh>)
178}
179
180#sub new_from_surface {
181# my ($class, $surface) = @_;
182#
183# $surface->rgba;
184#
185# $class->new (
186# data => $surface->pixels,
187# w => $surface->width,
188# h => $surface->height,
189# )
190#}
191
192sub new_from_layout {
193 my ($class, $layout) = @_;
194
195 my ($w, $h, $data) = $layout->render;
196
197 $class->new (
198 w => $w,
199 h => $h,
200 data => $data,
201 internalformat => GL_ALPHA4,
202 format => GL_ALPHA,
203 type => GL_UNSIGNED_BYTE,
204 ) 322 );
205} 323}
206 324
207sub new_from_opengl { 325package CFClient::Recorder;
208 my ($class, $w, $h, $cb) = @_;
209 326
210 $class->new (w => $w, h => $h, render_cb => $cb) 327our $RECORD_WINDOW;
211}
212 328
213sub topot { 329my $CMDBOX;
214 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] 330my $CURRENT_CMDS;
215} 331my $REC_BTN;
216 332
217sub upload { 333my @ALLOWED_MODIFIER_KEYS = (
334 (CFClient::SDLK_LSHIFT) => "LSHIFT",
335 (CFClient::SDLK_LCTRL ) => "LCTRL",
336 (CFClient::SDLK_LALT ) => "LALT",
337 (CFClient::SDLK_LMETA ) => "LMETA",
338
339 (CFClient::SDLK_RSHIFT) => "RSHIFT",
340 (CFClient::SDLK_RCTRL ) => "RCTRL",
341 (CFClient::SDLK_RALT ) => "RALT",
342 (CFClient::SDLK_RMETA ) => "RMETA",
343);
344
345my %ALLOWED_MODIFIERS = (
346 (CFClient::KMOD_LSHIFT) => "LSHIFT",
347 (CFClient::KMOD_LCTRL ) => "LCTRL",
348 (CFClient::KMOD_LALT ) => "LALT",
349 (CFClient::KMOD_LMETA ) => "LMETA",
350
351 (CFClient::KMOD_RSHIFT) => "RSHIFT",
352 (CFClient::KMOD_RCTRL ) => "RCTRL",
353 (CFClient::KMOD_RALT ) => "RALT",
354 (CFClient::KMOD_RMETA ) => "RMETA",
355);
356
357my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
358my @DIRECT_BIND_KEYS = (
359 CFClient::SDLK_F1,
360 CFClient::SDLK_F2,
361 CFClient::SDLK_F3,
362 CFClient::SDLK_F4,
363 CFClient::SDLK_F5,
364 CFClient::SDLK_F6,
365 CFClient::SDLK_F7,
366 CFClient::SDLK_F8,
367 CFClient::SDLK_F9,
368 CFClient::SDLK_F10,
369 CFClient::SDLK_F11,
370 CFClient::SDLK_F12,
371 CFClient::SDLK_F13,
372 CFClient::SDLK_F14,
373 CFClient::SDLK_F15,
374);
375
376# this binding dialog asks for a key-combo to be pressed
377# and if successful it binds the modifier+symbol to the
378# supplied actions in $cmd.
379# (Bindings are stored in $::CFG->{bindings}->{$mod}->{$sym})
380sub open_binding_dialog {
381 my ($cmd) = @_;
382
383 my $w = new CFClient::UI::FancyFrame
384 title => "Bind Action";
385
386 $w->add (my $vb = new CFClient::UI::VBox);
387 $vb->add (new CFClient::UI::Label
388 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
389 ."You can only bind 0-9 and F1-F15 without modifiers."
390 );
391 $vb->add (my $entry = new CFClient::UI::Entry
392 text => "",
393 on_key_down => sub {
394 my ($entry, $ev) = @_;
395
396 my $mod = $ev->{mod};
397 my $sym = $ev->{sym};
398
399 # XXX: This seems a little bit hackisch to me, but i have to ignore them
400 if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
401 return;
402 }
403
404 if ($mod == CFClient::KMOD_NONE
405 and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
406 and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
407 {
408 $::STATUSBOX->add (
409 "Can't bind key ".CFClient::SDL_GetKeyName ($sym)
410 ." directly without modifier! It would damage the completer handling."
411 );
412 return;
413 }
414
415 $entry->focus_out;
416
417 $::CFG->{bindings}->{$mod}->{$sym} = $cmd;
418 $::STATUSBOX->add ("Bound actions to '".keycombo_to_name ($mod, $sym)."'. Don't forget 'Save Config'!");
419
420 $w->destroy
421 });
422
423 $entry->focus_in;
424 $w->center;
425 $w->show;
426}
427
428sub keycombo_to_name {
429 my ($mod, $sym) = @_;
430
431 my $mods = join '+',
432 map { $ALLOWED_MODIFIERS{$_} }
433 grep { $_ & $mod }
434 keys %ALLOWED_MODIFIERS;
435 $mods .= "+" if $mods ne '';
436
437 return $mods . CFClient::SDL_GetKeyName ($sym);
438}
439
440sub clear_command_list {
441 $CMDBOX->clear () if $CMDBOX;
442}
443
444sub set_command_list {
218 my ($self) = @_; 445 my ($list) = @_;
219 446
220 return unless $GL_VERSION; 447 return unless $CMDBOX;
221 448
222 my $data; 449 $CMDBOX->clear ();
450 $CURRENT_CMDS = $list;
223 451
224 if (exists $self->{data}) { 452 my $idx = 0;
225 $data = $self->{data};
226 453
227 } elsif (exists $self->{render_cb}) { 454 for (@$list) {
228 glViewport 0, 0, $self->{w}, $self->{h}; 455 $CMDBOX->add (my $hb = new CFClient::UI::HBox);
229 glMatrixMode GL_PROJECTION;
230 glLoadIdentity;
231 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
232 glMatrixMode GL_MODELVIEW;
233 glLoadIdentity;
234 $self->{render_cb}->($self, $self->{w}, $self->{h});
235 456
236 } else { 457 my $i = $idx;
237 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type}) 458 $hb->add (new CFClient::UI::Button
238 = CFClient::load_image_inline $self->{image}; 459 text => "delete",
460 tooltip => "Deletes the action from the record",
461 on_activate => sub {
462 $CMDBOX->remove ($hb);
463 $list->[$i] = undef;
464 });
465
466 $hb->add (new CFClient::UI::Label text => $_);
467
468 $idx++
239 } 469 }
470}
240 471
241 my ($tw, $th) = @$self{qw(w h)}; 472# if $show is 1 the recorder will be shown
473sub start {
474 my ($show) = @_;
242 475
243 unless ($tw && $th) { 476 $RECORD_WINDOW->show if $show;
244 $tw = $th = 1; 477
245 $data = "\x00" x 64; 478 $REC_BTN->set_text ("stop recording");
479 $REC_BTN->{recording} = 1;
480 clear_command_list;
481 $::CONN->start_record;
482}
483
484# if $autobind is 1 the recorder will be automatically
485# jump into the binding query and hide the recorder window
486sub stop {
487 my ($autobind) = @_;
488
489 $REC_BTN->set_text ("start recording");
490 $REC_BTN->{recording} = 0;
491
492 my $rec = $::CONN->stop_record;
493 return unless ref $rec eq 'ARRAY';
494 set_command_list ($rec);
495
496 if ($autobind) {
497 open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
498 $RECORD_WINDOW->hide;
246 } 499 }
500}
247 501
248 $self->{minified} = [CFClient::average $tw, $th, $data] 502sub make_window {
249 if $self->{minify}; 503 $RECORD_WINDOW = new CFClient::UI::FancyFrame
504 req_y => 1,
505 req_x => -1,
506 title => "Action Recorder";
250 507
251 unless ($GL_NPOT) { 508 $RECORD_WINDOW->add (my $vb = new CFClient::UI::VBox);
252 # TODO: does not work for zero-sized textures 509 $vb->add ($REC_BTN = new CFClient::UI::Button
253 $tw = topot $tw; 510 text => "start recording",
254 $th = topot $th; 511 tooltip => "Start/Stops recording of actions."
512 ."(CTRL+Insert Starts the recorder, Insert Stops recorder and binds automatically)"
513 ."All subsequent actions after the recording started will be captured."
514 ."The actions are displayed after the record was stopped."
515 ."To bind the action you have to click on the 'Bind' button",
516 on_activate => sub {
517 my ($btn) = @_;
255 518
256 if ($tw != $self->{w} || $th != $self->{h} && defined $data) { 519 unless ($btn->{recording}) {
257 my $bpp = (length $data) / ($self->{w} * $self->{h}); 520 start;
258 $data = pack "(a" . ($tw * $bpp) . ")*", 521 } else {
259 unpack "(a" . ($self->{w} * $bpp) . ")*", $data; 522 stop;
260 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h}); 523 }
261 } 524 });
262 } 525 $vb->add ($CMDBOX = new CFClient::UI::VBox);
526 $vb->add (new CFClient::UI::Button
527 text => "bind",
528 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
529 on_activate => sub {
530 open_binding_dialog ([ grep { defined $_ } @$CURRENT_CMDS ]);
531 });
263 532
264 $self->{s} = $self->{w} / $tw; 533 $RECORD_WINDOW
265 $self->{t} = $self->{h} / $th;
266
267 $self->{name} ||= (pop @NAMES) || (glGenTextures 1)->[0];
268
269 glBindTexture GL_TEXTURE_2D, $self->{name};
270
271 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
272 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
273 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
274 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
275
276 if (defined $data) {
277 glTexImage2D GL_TEXTURE_2D, 0,
278 $self->{internalformat},
279 $tw, $th, # need to pad texture first
280 0,
281 $self->{format},
282 $self->{type},
283 $data;
284 glGetError and die;
285 } else {
286 glCopyTexImage2D GL_TEXTURE_2D, 0,
287 $self->{internalformat},
288 0, 0,
289 $tw, $th,
290 0;
291 glGetError and die "glCopyTexImage2D $tw,$th";
292 }
293} 534}
294
295sub DESTROY {
296 my ($self) = @_;
297
298 delete $TEXTURES{$self+0};
299
300 if (my $name = delete $self->{name}) {
301 glDeleteTextures $name;
302 push @NAMES, $name;
303 }
304
305}
306
307sub restore_state{
308 $_->upload
309 for grep $_, values %TEXTURES;
310};
311 535
3121; 5361;
313 537
314=back 538=back
315 539

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines