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

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.107 by root, Wed May 9 11:44:40 2007 UTC vs.
Revision 1.129 by root, Sun Jan 11 22:03:03 2009 UTC

1=head1 NAME 1=head1 NAME
2 2
3Crossfire - Crossfire maphandling 3Deliantra - Deliantra suppport module to read/write archetypes, maps etc.
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Deliantra;
8 8
9our $VERSION = '0.98'; 9our $VERSION = '1.23';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
… …
16use File::Spec; 16use File::Spec;
17use List::Util qw(min max); 17use List::Util qw(min max);
18use Storable qw(freeze thaw); 18use Storable qw(freeze thaw);
19 19
20our @EXPORT = qw( 20our @EXPORT = qw(
21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents 21 read_pak read_arch
22 *ARCH $TILE *FACE *FACEDATA
23 TILESIZE CACHESTRIDE
24 editor_archs arch_extents
22); 25);
23 26
24use JSON::XS qw(from_json to_json); 27use JSON::XS qw(decode_json encode_json);
25 28
26our $LIB = $ENV{CROSSFIRE_LIBDIR}; 29our $LIB = $ENV{DELIANTRA_LIBDIR};
27 30
28our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" 31our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
29 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 32 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
30 : File::Spec->tmpdir . "/crossfire"; 33 : File::Spec->tmpdir . "/deliantra";
31 34
32mkdir $VARDIR, 0777; 35mkdir $VARDIR, 0777;
33 36
34sub TILESIZE (){ 32 } 37sub TILESIZE (){ 32 }
38sub CACHESTRIDE (){ 64 }
35 39
36our %ARCH; 40our %ARCH;
41our %FACE; # face32
37our %FACE; 42our %FACEDATA;
38our $TILE; 43our $TILE;
39 44
40our %FIELD_MULTILINE = ( 45our %FIELD_MULTILINE = (
41 msg => "endmsg", 46 msg => "endmsg",
42 lore => "endlore", 47 lore => "endlore",
… …
64 69
65 elevation 70 elevation
66 71
67 name name_pl custom_name attach title race 72 name name_pl custom_name attach title race
68 slaying skill msg lore other_arch 73 slaying skill msg lore other_arch
69 face animation is_animated 74 sound sound_destroy face animation is_animated
70 magicmap smoothlevel smoothface 75 magicmap smoothlevel smoothface
71 str dex con wis pow cha int 76 str dex con wis pow cha int
72 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
73 exp perm_exp expmul 78 exp perm_exp expmul
74 food dam luck wc ac x y speed speed_left move_state attack_movement 79 food dam luck wc ac x y speed speed_left move_state attack_movement
… …
149); 154);
150 155
151our @MOVE_TYPE = keys %MOVE_TYPE; 156our @MOVE_TYPE = keys %MOVE_TYPE;
152 157
153{ 158{
154 package Crossfire::MoveType; 159 package Deliantra::MoveType;
155 160
156 use overload 161 use overload
157 '=' => sub { bless [@{$_[0]}], ref $_[0] }, 162 '=' => sub { bless [@{$_[0]}], ref $_[0] },
158 '""' => \&as_string, 163 '""' => \&as_string,
159 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef }, 164 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
… …
179 'eq' => sub { "$_[0]" eq "$_[1]" }, 184 'eq' => sub { "$_[0]" eq "$_[1]" },
180 'ne' => sub { "$_[0]" ne "$_[1]" }, 185 'ne' => sub { "$_[0]" ne "$_[1]" },
181 ; 186 ;
182} 187}
183 188
184sub Crossfire::MoveType::new { 189sub Deliantra::MoveType::new {
185 my ($class, $string) = @_; 190 my ($class, $string) = @_;
186 191
187 my $mask; 192 my $mask;
188 my $value; 193 my $value;
189 194
… …
203 } 208 }
204 209
205 (bless [$mask, $value], $class)->normalise 210 (bless [$mask, $value], $class)->normalise
206} 211}
207 212
208sub Crossfire::MoveType::normalise { 213sub Deliantra::MoveType::normalise {
209 my ($self) = @_; 214 my ($self) = @_;
210 215
211 if ($self->[0] & MOVE_ALL) { 216 if ($self->[0] & MOVE_ALL) {
212 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL); 217 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
213 $self->[0] &= $mask; 218 $self->[0] &= $mask;
… …
217 $self->[1] &= $self->[0]; 222 $self->[1] &= $self->[0];
218 223
219 $self 224 $self
220} 225}
221 226
222sub Crossfire::MoveType::as_string { 227sub Deliantra::MoveType::as_string {
223 my ($self) = @_; 228 my ($self) = @_;
224 229
225 my @res; 230 my @res;
226 231
227 my ($mask, $value) = @$self; 232 my ($mask, $value) = @$self;
228 233
229 for (@Crossfire::MOVE_TYPE) { 234 for (@Deliantra::MOVE_TYPE) {
230 my $bit = $Crossfire::MOVE_TYPE{$_}; 235 my $bit = $Deliantra::MOVE_TYPE{$_};
231 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 236 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
232 $mask &= ~$bit; 237 $mask &= ~$bit;
233 push @res, $value & $bit ? $_ : "-$_"; 238 push @res, $value & $bit ? $_ : "-$_";
234 } 239 }
235 } 240 }
… …
347 } else { 352 } else {
348 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 353 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
349 } 354 }
350 } 355 }
351 356
357 # check whether attachment is the same as in the archetype
358 if (exists $ob->{attach}) {
359 my $arch = $ARCH{$ob->{_name}};
360 my $js = JSON::XS->new->utf8->canonical (1);
361
362 if (defined $arch->{attach}
363 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
364 delete $ob->{attach}
365 }
366 }
367
352 # color_fg is used as default for magicmap if magicmap does not exist 368 # color_fg is used as default for magicmap if magicmap does not exist
353 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg}; 369 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
354 370
355 # nuke outdated or never supported fields 371 # nuke outdated or never supported fields
356 delete @$ob{qw( 372 delete @$ob{qw(
… …
364 380
365 # convert movement strings to bitsets 381 # convert movement strings to bitsets
366 for my $attr (keys %FIELD_MOVEMENT) { 382 for my $attr (keys %FIELD_MOVEMENT) {
367 next unless exists $ob->{$attr}; 383 next unless exists $ob->{$attr};
368 384
369 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 385 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
370 } 386 }
371 387
372 # convert outdated movement flags to new movement sets 388 # convert outdated movement flags to new movement sets
373 if (defined (my $v = delete $ob->{no_pass})) { 389 if (defined (my $v = delete $ob->{no_pass})) {
374 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 390 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
375 } 391 }
376 if (defined (my $v = delete $ob->{slow_move})) { 392 if (defined (my $v = delete $ob->{slow_move})) {
377 $ob->{move_slow} += "walk"; 393 $ob->{move_slow} += "walk";
378 $ob->{move_slow_penalty} = $v; 394 $ob->{move_slow_penalty} = $v;
379 } 395 }
380 if (defined (my $v = delete $ob->{walk_on})) { 396 if (defined (my $v = delete $ob->{walk_on})) {
381 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" } 397 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
382 } 398 }
383 if (defined (my $v = delete $ob->{walk_off})) { 399 if (defined (my $v = delete $ob->{walk_off})) {
384 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" } 400 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
385 } 401 }
386 if (defined (my $v = delete $ob->{fly_on})) { 402 if (defined (my $v = delete $ob->{fly_on})) {
387 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" } 403 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
388 } 404 }
389 if (defined (my $v = delete $ob->{fly_off})) { 405 if (defined (my $v = delete $ob->{fly_off})) {
390 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" } 406 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
391 } 407 }
392 if (defined (my $v = delete $ob->{flying})) { 408 if (defined (my $v = delete $ob->{flying})) {
393 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" } 409 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
394 } 410 }
395 411
396 # convert idiotic event_xxx things into objects 412 # convert idiotic event_xxx things into objects
397 while (my ($event, $subtype) = each %EVENT_TYPE) { 413 while (my ($event, $subtype) = each %EVENT_TYPE) {
398 if (exists $ob->{"event_${event}_plugin"}) { 414 if (exists $ob->{"event_${event}_plugin"}) {
… …
414# arch as in "arch xxx", ie.. objects 430# arch as in "arch xxx", ie.. objects
415sub normalize_arch($) { 431sub normalize_arch($) {
416 my ($ob) = @_; 432 my ($ob) = @_;
417 433
418 normalize_object $ob; 434 normalize_object $ob;
435
436 return if $ob->{_atype} eq "object";
419 437
420 my $arch = $ARCH{$ob->{_name}} 438 my $arch = $ARCH{$ob->{_name}}
421 or (warn "$ob->{_name}: no such archetype", return $ob); 439 or (warn "$ob->{_name}: no such archetype", return $ob);
422 440
423 if ($arch->{type} == 22) { # map 441 if ($arch->{type} == 22) { # map
… …
459} 477}
460 478
461sub attr_thaw($) { 479sub attr_thaw($) {
462 my ($ob) = @_; 480 my ($ob) = @_;
463 481
464 $ob->{attach} = from_json $ob->{attach} 482 $ob->{attach} = decode_json $ob->{attach}
465 if exists $ob->{attach}; 483 if exists $ob->{attach};
466 484
467 $ob 485 $ob
468} 486}
469 487
470sub attr_freeze($) { 488sub attr_freeze($) {
471 my ($ob) = @_; 489 my ($ob) = @_;
472 490
473 $ob->{attach} = Crossfire::to_json $ob->{attach} 491 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
474 if exists $ob->{attach}; 492 if exists $ob->{attach};
475 493
476 $ob 494 $ob
477} 495}
478 496
… …
498 516
499 my %arc; 517 my %arc;
500 my ($more, $prev); 518 my ($more, $prev);
501 my $comment; 519 my $comment;
502 520
503 open my $fh, "<:raw:perlio:utf8", $path 521 open my $fh, "<:utf8", $path
504 or Carp::croak "$path: $!"; 522 or Carp::croak "$path: $!";
505 523
506# binmode $fh; 524# binmode $fh;
507 525
508 my $parse_block; $parse_block = sub { 526 my $parse_block; $parse_block = sub {
… …
608 my $str; 626 my $str;
609 627
610 my $append; $append = sub { 628 my $append; $append = sub {
611 my %a = %{$_[0]}; 629 my %a = %{$_[0]};
612 630
613 Crossfire::attr_freeze \%a; 631 Deliantra::attr_freeze \%a;
614 Crossfire::normalize_arch \%a; 632 Deliantra::normalize_arch \%a;
615 633
616 # undo the bit-split we did before 634 # undo the bit-split we did before
617 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 635 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
618 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 636 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
619 | (delete $a{attack_movement_bits_4_7}); 637 | (delete $a{attack_movement_bits_4_7});
… …
637 } 655 }
638 656
639 my @kv; 657 my @kv;
640 658
641 for ($a{_name} eq "map" 659 for ($a{_name} eq "map"
642 ? @Crossfire::FIELD_ORDER_MAP 660 ? @Deliantra::FIELD_ORDER_MAP
643 : @Crossfire::FIELD_ORDER) { 661 : @Deliantra::FIELD_ORDER) {
644 push @kv, [$_, delete $a{$_}] 662 push @kv, [$_, delete $a{$_}]
645 if exists $a{$_}; 663 if exists $a{$_};
646 } 664 }
647 665
648 for (sort keys %a) { 666 for (sort keys %a) {
… …
651 } 669 }
652 670
653 for (@kv) { 671 for (@kv) {
654 my ($k, $v) = @$_; 672 my ($k, $v) = @$_;
655 673
656 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 674 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
657 $v =~ s/\n$//; 675 $v =~ s/\n$//;
658 $str .= "$k\n$v\n$end\n"; 676 $str .= "$k\n$v\n$end\n";
659 } else { 677 } else {
660 $str .= "$k $v\n"; 678 $str .= "$k $v\n";
661 } 679 }
… …
757=cut 775=cut
758 776
759sub arch_attr($) { 777sub arch_attr($) {
760 my ($obj) = @_; 778 my ($obj) = @_;
761 779
762 require Crossfire::Data; 780 require Deliantra::Data;
763 781
764 my $root; 782 my $root;
765 my $attr = { }; 783 my $attr = { };
766 784
767 my $arch = $ARCH{ $obj->{_name} }; 785 my $arch = $ARCH{ $obj->{_name} };
768 my $type = $obj->{type} || $arch->{type}; 786 my $type = $obj->{type} || $arch->{type};
769 787
770 if ($type > 0) { 788 if ($type > 0) {
771 $root = $Crossfire::Data::ATTR{$type}; 789 $root = $Deliantra::Data::ATTR{$type};
772 } else { 790 } else {
773 my %a = (%$arch, %$obj); 791 my %a = (%$arch, %$obj);
774 792
775 if ($a{is_floor} && !$a{alive}) { 793 if ($a{is_floor} && !$a{alive}) {
776 $root = $Crossfire::Data::TYPE{Floor}; 794 $root = $Deliantra::Data::TYPE{Floor};
777 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 795 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
778 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 796 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
779 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 797 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
780 $root = $Crossfire::Data::TYPE{Wall}; 798 $root = $Deliantra::Data::TYPE{Wall};
781 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 799 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
782 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 800 $root = $Deliantra::Data::TYPE{"Weak Wall"};
783 } else { 801 } else {
784 $root = $Crossfire::Data::TYPE{Misc}; 802 $root = $Deliantra::Data::TYPE{Misc};
785 } 803 }
786 } 804 }
787 805
788 my @import = ($root); 806 my @import = ($root);
789 807
790 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 808 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
791 unless $type == 116; 809 unless $type == 116;
792 810
793 my (%ignore); 811 my (%ignore);
794 my (@section_order, %section, @attr_order); 812 my (@section_order, %section, @attr_order);
795 813
796 while (my $type = shift @import) { 814 while (my $type = shift @import) {
815 push @import,
816 grep $_,
817 map $Deliantra::Data::TYPE{$_},
797 push @import, @{$type->{import} || []}; 818 @{$type->{import} || []};
798 819
799 $attr->{$_} ||= $type->{$_} 820 $attr->{$_} ||= $type->{$_}
800 for qw(name desc use); 821 for qw(name desc use);
801 822
802 for (@{$type->{ignore} || []}) { 823 for (@{$type->{ignore} || []}) {
… …
891} 912}
892 913
893sub construct_tilecache_pb { 914sub construct_tilecache_pb {
894 my ($idx, $cache) = @_; 915 my ($idx, $cache) = @_;
895 916
896 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64; 917 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
897 918
898 while (my ($name, $tile) = each %$cache) { 919 while (my ($name, $tile) = each %$cache) {
899 my $tpb = delete $tile->{pb}; 920 my $tpb = delete $tile->{pb};
900 my $ofs = $tile->{idx}; 921 my $ofs = $tile->{idx};
901 922
902 for my $x (0 .. $tile->{w} - 1) { 923 for my $x (0 .. $tile->{w} - 1) {
903 for my $y (0 .. $tile->{h} - 1) { 924 for my $y (0 .. $tile->{h} - 1) {
904 my $idx = $ofs + $x + $y * $tile->{w}; 925 my $idx = $ofs + $x + $y * $tile->{w};
905 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE, 926 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
906 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 927 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
907 } 928 }
908 } 929 }
909 } 930 }
910 931
911 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); 932 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
… …
927=cut 948=cut
928 949
929sub load_tilecache() { 950sub load_tilecache() {
930 require Gtk2; 951 require Gtk2;
931 952
932 if (-e "$LIB/crossfire.0") { # Crossfire1 version
933 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
934 sub {
935 my $tile = read_pak "$LIB/crossfire.0";
936
937 my %cache;
938
939 my $idx = 0;
940
941 for my $name (sort keys %$tile) {
942 my $pb = new Gtk2::Gdk::PixbufLoader;
943 $pb->write ($tile->{$name});
944 $pb->close;
945 my $pb = $pb->get_pixbuf;
946
947 my $tile = $cache{$name} = {
948 pb => $pb,
949 idx => $idx,
950 w => int $pb->get_width / TILESIZE,
951 h => int $pb->get_height / TILESIZE,
952 };
953
954 $idx += $tile->{w} * $tile->{h};
955 }
956
957 construct_tilecache_pb $idx, \%cache;
958
959 \%cache
960 };
961
962 } else { # Crossfire+ version
963 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache, 953 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
964 sub { 954 sub {
965 my %cache; 955 my %cache;
966 my $facedata = Storable::retrieve "$LIB/facedata"; 956 my $facedata = Storable::retrieve "$LIB/facedata";
967 957
968 $facedata->{version} == 2 958 $facedata->{version} == 2
969 or die "$LIB/facedata: version mismatch, cannot proceed."; 959 or die "$LIB/facedata: version mismatch, cannot proceed.";
970 960
971 my $faces = $facedata->{faceinfo}; 961 my $faces = $facedata->{faceinfo};
972 my $idx = 0; 962 my $idx = 0;
973 963
974 for (sort keys %$faces) { 964 for (sort keys %$faces) {
975 my ($face, $info) = ($_, $faces->{$_}); 965 my ($face, $info) = ($_, $faces->{$_});
976 966
977 my $pb = new Gtk2::Gdk::PixbufLoader; 967 my $pb = new Gtk2::Gdk::PixbufLoader;
978 $pb->write ($info->{data32}); 968 $pb->write ($info->{data32});
979 $pb->close; 969 $pb->close;
980 my $pb = $pb->get_pixbuf; 970 my $pb = $pb->get_pixbuf;
981 971
982 my $tile = $cache{$face} = { 972 my $tile = $cache{$face} = {
983 pb => $pb, 973 pb => $pb,
984 idx => $idx, 974 idx => $idx,
985 w => int $pb->get_width / TILESIZE, 975 w => int $pb->get_width / TILESIZE,
986 h => int $pb->get_height / TILESIZE, 976 h => int $pb->get_height / TILESIZE,
987 }; 977 };
988 978
989 $idx += $tile->{w} * $tile->{h}; 979 $idx += $tile->{w} * $tile->{h};
990 } 980 }
991 981
992 construct_tilecache_pb $idx, \%cache; 982 construct_tilecache_pb $idx, \%cache;
993 983
994 \%cache 984 \%cache
995 }; 985 };
996 }
997} 986}
998 987
999=head1 AUTHOR 988=head1 AUTHOR
1000 989
1001 Marc Lehmann <schmorp@schmorp.de> 990 Marc Lehmann <schmorp@schmorp.de>
… …
1005 http://www.ta-sa.org/ 994 http://www.ta-sa.org/
1006 995
1007=cut 996=cut
1008 997
10091 9981
999

Diff Legend

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