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.106 by root, Mon Apr 23 19:09:48 2007 UTC vs.
Revision 1.125 by root, Sun Aug 31 09:19:22 2008 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.22';
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",
83 resist_life_stealing resist_disease 88 resist_life_stealing resist_disease
84 89
85 path_attuned path_repelled path_denied material materialname 90 path_attuned path_repelled path_denied material materialname
86 value carrying weight invisible state magic 91 value carrying weight invisible state magic
87 last_heal last_sp last_grace last_eat 92 last_heal last_sp last_grace last_eat
88 connected glow_radius randomitems npx_status npc_program 93 connected glow_radius randomitems tresure_env npx_status npc_program
89 run_away pick_up container will_apply smoothlevel 94 run_away pick_up container will_apply smoothlevel
90 current_weapon_script weapontype tooltype elevation client_type 95 current_weapon_script weapontype tooltype elevation client_type
91 item_power duration range 96 item_power duration range
92 range_modifier duration_modifier dam_modifier gen_sp_armour 97 range_modifier duration_modifier dam_modifier gen_sp_armour
93 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty 98 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
104 known_magical known_cursed can_use_skill been_applied has_ready_scroll 109 known_magical known_cursed can_use_skill been_applied has_ready_scroll
105 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly 110 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
106 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark 111 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
107 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage 112 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
108 activate_on_push activate_on_release is_water use_content_on_gen is_buildable 113 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
114 precious
109 115
110 body_range body_arm body_torso body_head body_neck body_skill 116 body_range body_arm body_torso body_head body_neck body_skill
111 body_finger body_shoulder body_foot body_hand body_wrist body_waist 117 body_finger body_shoulder body_foot body_hand body_wrist body_waist
112)); 118));
113 119
148); 154);
149 155
150our @MOVE_TYPE = keys %MOVE_TYPE; 156our @MOVE_TYPE = keys %MOVE_TYPE;
151 157
152{ 158{
153 package Crossfire::MoveType; 159 package Deliantra::MoveType;
154 160
155 use overload 161 use overload
156 '=' => sub { bless [@{$_[0]}], ref $_[0] }, 162 '=' => sub { bless [@{$_[0]}], ref $_[0] },
157 '""' => \&as_string, 163 '""' => \&as_string,
158 '>=' => 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 },
178 'eq' => sub { "$_[0]" eq "$_[1]" }, 184 'eq' => sub { "$_[0]" eq "$_[1]" },
179 'ne' => sub { "$_[0]" ne "$_[1]" }, 185 'ne' => sub { "$_[0]" ne "$_[1]" },
180 ; 186 ;
181} 187}
182 188
183sub Crossfire::MoveType::new { 189sub Deliantra::MoveType::new {
184 my ($class, $string) = @_; 190 my ($class, $string) = @_;
185 191
186 my $mask; 192 my $mask;
187 my $value; 193 my $value;
188 194
202 } 208 }
203 209
204 (bless [$mask, $value], $class)->normalise 210 (bless [$mask, $value], $class)->normalise
205} 211}
206 212
207sub Crossfire::MoveType::normalise { 213sub Deliantra::MoveType::normalise {
208 my ($self) = @_; 214 my ($self) = @_;
209 215
210 if ($self->[0] & MOVE_ALL) { 216 if ($self->[0] & MOVE_ALL) {
211 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);
212 $self->[0] &= $mask; 218 $self->[0] &= $mask;
216 $self->[1] &= $self->[0]; 222 $self->[1] &= $self->[0];
217 223
218 $self 224 $self
219} 225}
220 226
221sub Crossfire::MoveType::as_string { 227sub Deliantra::MoveType::as_string {
222 my ($self) = @_; 228 my ($self) = @_;
223 229
224 my @res; 230 my @res;
225 231
226 my ($mask, $value) = @$self; 232 my ($mask, $value) = @$self;
227 233
228 for (@Crossfire::MOVE_TYPE) { 234 for (@Deliantra::MOVE_TYPE) {
229 my $bit = $Crossfire::MOVE_TYPE{$_}; 235 my $bit = $Deliantra::MOVE_TYPE{$_};
230 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 236 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
231 $mask &= ~$bit; 237 $mask &= ~$bit;
232 push @res, $value & $bit ? $_ : "-$_"; 238 push @res, $value & $bit ? $_ : "-$_";
233 } 239 }
234 } 240 }
346 } else { 352 } else {
347 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 353 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
348 } 354 }
349 } 355 }
350 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
351 # 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
352 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg}; 369 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
353 370
354 # nuke outdated or never supported fields 371 # nuke outdated or never supported fields
355 delete @$ob{qw( 372 delete @$ob{qw(
363 380
364 # convert movement strings to bitsets 381 # convert movement strings to bitsets
365 for my $attr (keys %FIELD_MOVEMENT) { 382 for my $attr (keys %FIELD_MOVEMENT) {
366 next unless exists $ob->{$attr}; 383 next unless exists $ob->{$attr};
367 384
368 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 385 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
369 } 386 }
370 387
371 # convert outdated movement flags to new movement sets 388 # convert outdated movement flags to new movement sets
372 if (defined (my $v = delete $ob->{no_pass})) { 389 if (defined (my $v = delete $ob->{no_pass})) {
373 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 390 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
374 } 391 }
375 if (defined (my $v = delete $ob->{slow_move})) { 392 if (defined (my $v = delete $ob->{slow_move})) {
376 $ob->{move_slow} += "walk"; 393 $ob->{move_slow} += "walk";
377 $ob->{move_slow_penalty} = $v; 394 $ob->{move_slow_penalty} = $v;
378 } 395 }
379 if (defined (my $v = delete $ob->{walk_on})) { 396 if (defined (my $v = delete $ob->{walk_on})) {
380 $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" }
381 } 398 }
382 if (defined (my $v = delete $ob->{walk_off})) { 399 if (defined (my $v = delete $ob->{walk_off})) {
383 $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" }
384 } 401 }
385 if (defined (my $v = delete $ob->{fly_on})) { 402 if (defined (my $v = delete $ob->{fly_on})) {
386 $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" }
387 } 404 }
388 if (defined (my $v = delete $ob->{fly_off})) { 405 if (defined (my $v = delete $ob->{fly_off})) {
389 $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" }
390 } 407 }
391 if (defined (my $v = delete $ob->{flying})) { 408 if (defined (my $v = delete $ob->{flying})) {
392 $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" }
393 } 410 }
394 411
395 # convert idiotic event_xxx things into objects 412 # convert idiotic event_xxx things into objects
396 while (my ($event, $subtype) = each %EVENT_TYPE) { 413 while (my ($event, $subtype) = each %EVENT_TYPE) {
397 if (exists $ob->{"event_${event}_plugin"}) { 414 if (exists $ob->{"event_${event}_plugin"}) {
458} 475}
459 476
460sub attr_thaw($) { 477sub attr_thaw($) {
461 my ($ob) = @_; 478 my ($ob) = @_;
462 479
463 $ob->{attach} = from_json $ob->{attach} 480 $ob->{attach} = decode_json $ob->{attach}
464 if exists $ob->{attach}; 481 if exists $ob->{attach};
465 482
466 $ob 483 $ob
467} 484}
468 485
469sub attr_freeze($) { 486sub attr_freeze($) {
470 my ($ob) = @_; 487 my ($ob) = @_;
471 488
472 $ob->{attach} = Crossfire::to_json $ob->{attach} 489 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
473 if exists $ob->{attach}; 490 if exists $ob->{attach};
474 491
475 $ob 492 $ob
476} 493}
477 494
607 my $str; 624 my $str;
608 625
609 my $append; $append = sub { 626 my $append; $append = sub {
610 my %a = %{$_[0]}; 627 my %a = %{$_[0]};
611 628
612 Crossfire::attr_freeze \%a; 629 Deliantra::attr_freeze \%a;
613 Crossfire::normalize_arch \%a; 630 Deliantra::normalize_arch \%a;
614 631
615 # undo the bit-split we did before 632 # undo the bit-split we did before
616 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 633 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
617 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 634 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
618 | (delete $a{attack_movement_bits_4_7}); 635 | (delete $a{attack_movement_bits_4_7});
636 } 653 }
637 654
638 my @kv; 655 my @kv;
639 656
640 for ($a{_name} eq "map" 657 for ($a{_name} eq "map"
641 ? @Crossfire::FIELD_ORDER_MAP 658 ? @Deliantra::FIELD_ORDER_MAP
642 : @Crossfire::FIELD_ORDER) { 659 : @Deliantra::FIELD_ORDER) {
643 push @kv, [$_, delete $a{$_}] 660 push @kv, [$_, delete $a{$_}]
644 if exists $a{$_}; 661 if exists $a{$_};
645 } 662 }
646 663
647 for (sort keys %a) { 664 for (sort keys %a) {
650 } 667 }
651 668
652 for (@kv) { 669 for (@kv) {
653 my ($k, $v) = @$_; 670 my ($k, $v) = @$_;
654 671
655 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 672 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
656 $v =~ s/\n$//; 673 $v =~ s/\n$//;
657 $str .= "$k\n$v\n$end\n"; 674 $str .= "$k\n$v\n$end\n";
658 } else { 675 } else {
659 $str .= "$k $v\n"; 676 $str .= "$k $v\n";
660 } 677 }
756=cut 773=cut
757 774
758sub arch_attr($) { 775sub arch_attr($) {
759 my ($obj) = @_; 776 my ($obj) = @_;
760 777
761 require Crossfire::Data; 778 require Deliantra::Data;
762 779
763 my $root; 780 my $root;
764 my $attr = { }; 781 my $attr = { };
765 782
766 my $arch = $ARCH{ $obj->{_name} }; 783 my $arch = $ARCH{ $obj->{_name} };
767 my $type = $obj->{type} || $arch->{type}; 784 my $type = $obj->{type} || $arch->{type};
768 785
769 if ($type > 0) { 786 if ($type > 0) {
770 $root = $Crossfire::Data::ATTR{$type}; 787 $root = $Deliantra::Data::ATTR{$type};
771 } else { 788 } else {
772 my %a = (%$arch, %$obj); 789 my %a = (%$arch, %$obj);
773 790
774 if ($a{is_floor} && !$a{alive}) { 791 if ($a{is_floor} && !$a{alive}) {
775 $root = $Crossfire::Data::TYPE{Floor}; 792 $root = $Deliantra::Data::TYPE{Floor};
776 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 793 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
777 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 794 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
778 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 795 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
779 $root = $Crossfire::Data::TYPE{Wall}; 796 $root = $Deliantra::Data::TYPE{Wall};
780 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 797 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
781 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 798 $root = $Deliantra::Data::TYPE{"Weak Wall"};
782 } else { 799 } else {
783 $root = $Crossfire::Data::TYPE{Misc}; 800 $root = $Deliantra::Data::TYPE{Misc};
784 } 801 }
785 } 802 }
786 803
787 my @import = ($root); 804 my @import = ($root);
788 805
789 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 806 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
790 unless $type == 116; 807 unless $type == 116;
791 808
792 my (%ignore); 809 my (%ignore);
793 my (@section_order, %section, @attr_order); 810 my (@section_order, %section, @attr_order);
794 811
795 while (my $type = shift @import) { 812 while (my $type = shift @import) {
813 push @import,
814 grep $_,
815 map $Deliantra::Data::TYPE{$_},
796 push @import, @{$type->{import} || []}; 816 @{$type->{import} || []};
797 817
798 $attr->{$_} ||= $type->{$_} 818 $attr->{$_} ||= $type->{$_}
799 for qw(name desc use); 819 for qw(name desc use);
800 820
801 for (@{$type->{ignore} || []}) { 821 for (@{$type->{ignore} || []}) {
890} 910}
891 911
892sub construct_tilecache_pb { 912sub construct_tilecache_pb {
893 my ($idx, $cache) = @_; 913 my ($idx, $cache) = @_;
894 914
895 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64; 915 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
896 916
897 while (my ($name, $tile) = each %$cache) { 917 while (my ($name, $tile) = each %$cache) {
898 my $tpb = delete $tile->{pb}; 918 my $tpb = delete $tile->{pb};
899 my $ofs = $tile->{idx}; 919 my $ofs = $tile->{idx};
900 920
901 for my $x (0 .. $tile->{w} - 1) { 921 for my $x (0 .. $tile->{w} - 1) {
902 for my $y (0 .. $tile->{h} - 1) { 922 for my $y (0 .. $tile->{h} - 1) {
903 my $idx = $ofs + $x + $y * $tile->{w}; 923 my $idx = $ofs + $x + $y * $tile->{w};
904 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE, 924 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
905 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 925 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
906 } 926 }
907 } 927 }
908 } 928 }
909 929
910 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); 930 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
926=cut 946=cut
927 947
928sub load_tilecache() { 948sub load_tilecache() {
929 require Gtk2; 949 require Gtk2;
930 950
931 if (-e "$LIB/crossfire.0") { # Crossfire1 version
932 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
933 sub {
934 my $tile = read_pak "$LIB/crossfire.0";
935
936 my %cache;
937
938 my $idx = 0;
939
940 for my $name (sort keys %$tile) {
941 my $pb = new Gtk2::Gdk::PixbufLoader;
942 $pb->write ($tile->{$name});
943 $pb->close;
944 my $pb = $pb->get_pixbuf;
945
946 my $tile = $cache{$name} = {
947 pb => $pb,
948 idx => $idx,
949 w => int $pb->get_width / TILESIZE,
950 h => int $pb->get_height / TILESIZE,
951 };
952
953 $idx += $tile->{w} * $tile->{h};
954 }
955
956 construct_tilecache_pb $idx, \%cache;
957
958 \%cache
959 };
960
961 } else { # Crossfire+ version
962 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache, 951 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
963 sub { 952 sub {
964 my %cache; 953 my %cache;
965 my $facedata = Storable::retrieve "$LIB/facedata"; 954 my $facedata = Storable::retrieve "$LIB/facedata";
966 955
967 $facedata->{version} == 2 956 $facedata->{version} == 2
968 or die "$LIB/facedata: version mismatch, cannot proceed."; 957 or die "$LIB/facedata: version mismatch, cannot proceed.";
969 958
970 my $faces = $facedata->{faceinfo}; 959 my $faces = $facedata->{faceinfo};
971 my $idx = 0; 960 my $idx = 0;
972 961
973 for (sort keys %$faces) { 962 for (sort keys %$faces) {
974 my ($face, $info) = ($_, $faces->{$_}); 963 my ($face, $info) = ($_, $faces->{$_});
975 964
976 my $pb = new Gtk2::Gdk::PixbufLoader; 965 my $pb = new Gtk2::Gdk::PixbufLoader;
977 $pb->write ($info->{data32}); 966 $pb->write ($info->{data32});
978 $pb->close; 967 $pb->close;
979 my $pb = $pb->get_pixbuf; 968 my $pb = $pb->get_pixbuf;
980 969
981 my $tile = $cache{$face} = { 970 my $tile = $cache{$face} = {
982 pb => $pb, 971 pb => $pb,
983 idx => $idx, 972 idx => $idx,
984 w => int $pb->get_width / TILESIZE, 973 w => int $pb->get_width / TILESIZE,
985 h => int $pb->get_height / TILESIZE, 974 h => int $pb->get_height / TILESIZE,
986 }; 975 };
987 976
988 $idx += $tile->{w} * $tile->{h}; 977 $idx += $tile->{w} * $tile->{h};
989 } 978 }
990 979
991 construct_tilecache_pb $idx, \%cache; 980 construct_tilecache_pb $idx, \%cache;
992 981
993 \%cache 982 \%cache
994 }; 983 };
995 }
996} 984}
997 985
998=head1 AUTHOR 986=head1 AUTHOR
999 987
1000 Marc Lehmann <schmorp@schmorp.de> 988 Marc Lehmann <schmorp@schmorp.de>
1004 http://www.ta-sa.org/ 992 http://www.ta-sa.org/
1005 993
1006=cut 994=cut
1007 995
10081 9961
997

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines