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.108 by elmex, Wed May 23 20:21:28 2007 UTC vs.
Revision 1.131 by root, Tue Sep 1 21:37:25 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.24';
10 10
11use strict; 11use common::sense;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
15use Carp (); 15use Carp ();
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
… …
146 boat => MOVE_BOAT, 151 boat => MOVE_BOAT,
147 ship => MOVE_SHIP, 152 ship => MOVE_SHIP,
148 all => MOVE_ALL, 153 all => MOVE_ALL,
149); 154);
150 155
151our @MOVE_TYPE = keys %MOVE_TYPE; 156our @MOVE_TYPE = qw(all ship boat swim flying fly_high fly_low walk);
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 },
… …
177 $_[0] 182 $_[0]
178 }, 183 },
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}
183 187
184sub Crossfire::MoveType::new { 188 sub TO_JSON {
189 $_[0][0]
190 }
191}
192
193sub Deliantra::MoveType::new {
185 my ($class, $string) = @_; 194 my ($class, $string) = @_;
186 195
187 my $mask; 196 my $mask;
188 my $value; 197 my $value;
189 198
… …
203 } 212 }
204 213
205 (bless [$mask, $value], $class)->normalise 214 (bless [$mask, $value], $class)->normalise
206} 215}
207 216
208sub Crossfire::MoveType::normalise { 217sub Deliantra::MoveType::normalise {
209 my ($self) = @_; 218 my ($self) = @_;
210 219
211 if ($self->[0] & MOVE_ALL) { 220 if ($self->[0] & MOVE_ALL) {
212 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL); 221 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
213 $self->[0] &= $mask; 222 $self->[0] &= $mask;
… …
217 $self->[1] &= $self->[0]; 226 $self->[1] &= $self->[0];
218 227
219 $self 228 $self
220} 229}
221 230
222sub Crossfire::MoveType::as_string { 231sub Deliantra::MoveType::as_string {
223 my ($self) = @_; 232 my ($self) = @_;
224 233
225 my @res; 234 my @res;
226 235
227 my ($mask, $value) = @$self; 236 my ($mask, $value) = @$self;
228 237
229 for (@Crossfire::MOVE_TYPE) { 238 for (@Deliantra::MOVE_TYPE) {
230 my $bit = $Crossfire::MOVE_TYPE{$_}; 239 my $bit = $Deliantra::MOVE_TYPE{$_};
231 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 240 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
232 $mask &= ~$bit; 241 $mask &= ~$bit;
233 push @res, $value & $bit ? $_ : "-$_"; 242 push @res, $value & $bit ? $_ : "-$_";
234 } 243 }
235 } 244 }
… …
352 # check whether attachment is the same as in the archetype 361 # check whether attachment is the same as in the archetype
353 if (exists $ob->{attach}) { 362 if (exists $ob->{attach}) {
354 my $arch = $ARCH{$ob->{_name}}; 363 my $arch = $ARCH{$ob->{_name}};
355 my $js = JSON::XS->new->utf8->canonical (1); 364 my $js = JSON::XS->new->utf8->canonical (1);
356 365
366 if (defined $arch->{attach}
357 if ($js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) { 367 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
358 delete $ob->{attach} 368 delete $ob->{attach}
359 } 369 }
360 } 370 }
361 371
362 # color_fg is used as default for magicmap if magicmap does not exist 372 # color_fg is used as default for magicmap if magicmap does not exist
… …
374 384
375 # convert movement strings to bitsets 385 # convert movement strings to bitsets
376 for my $attr (keys %FIELD_MOVEMENT) { 386 for my $attr (keys %FIELD_MOVEMENT) {
377 next unless exists $ob->{$attr}; 387 next unless exists $ob->{$attr};
378 388
379 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 389 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
380 } 390 }
381 391
382 # convert outdated movement flags to new movement sets 392 # convert outdated movement flags to new movement sets
383 if (defined (my $v = delete $ob->{no_pass})) { 393 if (defined (my $v = delete $ob->{no_pass})) {
384 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 394 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
385 } 395 }
386 if (defined (my $v = delete $ob->{slow_move})) { 396 if (defined (my $v = delete $ob->{slow_move})) {
387 $ob->{move_slow} += "walk"; 397 $ob->{move_slow} += "walk";
388 $ob->{move_slow_penalty} = $v; 398 $ob->{move_slow_penalty} = $v;
389 } 399 }
390 if (defined (my $v = delete $ob->{walk_on})) { 400 if (defined (my $v = delete $ob->{walk_on})) {
391 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" } 401 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
392 } 402 }
393 if (defined (my $v = delete $ob->{walk_off})) { 403 if (defined (my $v = delete $ob->{walk_off})) {
394 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" } 404 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
395 } 405 }
396 if (defined (my $v = delete $ob->{fly_on})) { 406 if (defined (my $v = delete $ob->{fly_on})) {
397 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" } 407 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
398 } 408 }
399 if (defined (my $v = delete $ob->{fly_off})) { 409 if (defined (my $v = delete $ob->{fly_off})) {
400 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" } 410 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
401 } 411 }
402 if (defined (my $v = delete $ob->{flying})) { 412 if (defined (my $v = delete $ob->{flying})) {
403 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" } 413 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
404 } 414 }
405 415
406 # convert idiotic event_xxx things into objects 416 # convert idiotic event_xxx things into objects
407 while (my ($event, $subtype) = each %EVENT_TYPE) { 417 while (my ($event, $subtype) = each %EVENT_TYPE) {
408 if (exists $ob->{"event_${event}_plugin"}) { 418 if (exists $ob->{"event_${event}_plugin"}) {
… …
424# arch as in "arch xxx", ie.. objects 434# arch as in "arch xxx", ie.. objects
425sub normalize_arch($) { 435sub normalize_arch($) {
426 my ($ob) = @_; 436 my ($ob) = @_;
427 437
428 normalize_object $ob; 438 normalize_object $ob;
439
440 return if $ob->{_atype} eq "object";
429 441
430 my $arch = $ARCH{$ob->{_name}} 442 my $arch = $ARCH{$ob->{_name}}
431 or (warn "$ob->{_name}: no such archetype", return $ob); 443 or (warn "$ob->{_name}: no such archetype", return $ob);
432 444
433 if ($arch->{type} == 22) { # map 445 if ($arch->{type} == 22) { # map
… …
469} 481}
470 482
471sub attr_thaw($) { 483sub attr_thaw($) {
472 my ($ob) = @_; 484 my ($ob) = @_;
473 485
474 $ob->{attach} = from_json $ob->{attach} 486 $ob->{attach} = decode_json $ob->{attach}
475 if exists $ob->{attach}; 487 if exists $ob->{attach};
476 488
477 $ob 489 $ob
478} 490}
479 491
480sub attr_freeze($) { 492sub attr_freeze($) {
481 my ($ob) = @_; 493 my ($ob) = @_;
482 494
483 $ob->{attach} = Crossfire::to_json $ob->{attach} 495 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
484 if exists $ob->{attach}; 496 if exists $ob->{attach};
485 497
486 $ob 498 $ob
487} 499}
488 500
… …
508 520
509 my %arc; 521 my %arc;
510 my ($more, $prev); 522 my ($more, $prev);
511 my $comment; 523 my $comment;
512 524
513 open my $fh, "<:raw:perlio:utf8", $path 525 open my $fh, "<:utf8", $path
514 or Carp::croak "$path: $!"; 526 or Carp::croak "$path: $!";
515 527
516# binmode $fh; 528# binmode $fh;
517 529
518 my $parse_block; $parse_block = sub { 530 my $parse_block; $parse_block = sub {
… …
618 my $str; 630 my $str;
619 631
620 my $append; $append = sub { 632 my $append; $append = sub {
621 my %a = %{$_[0]}; 633 my %a = %{$_[0]};
622 634
623 Crossfire::attr_freeze \%a; 635 Deliantra::attr_freeze \%a;
624 Crossfire::normalize_arch \%a; 636 Deliantra::normalize_arch \%a;
625 637
626 # undo the bit-split we did before 638 # undo the bit-split we did before
627 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 639 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
628 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 640 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
629 | (delete $a{attack_movement_bits_4_7}); 641 | (delete $a{attack_movement_bits_4_7});
… …
647 } 659 }
648 660
649 my @kv; 661 my @kv;
650 662
651 for ($a{_name} eq "map" 663 for ($a{_name} eq "map"
652 ? @Crossfire::FIELD_ORDER_MAP 664 ? @Deliantra::FIELD_ORDER_MAP
653 : @Crossfire::FIELD_ORDER) { 665 : @Deliantra::FIELD_ORDER) {
654 push @kv, [$_, delete $a{$_}] 666 push @kv, [$_, delete $a{$_}]
655 if exists $a{$_}; 667 if exists $a{$_};
656 } 668 }
657 669
658 for (sort keys %a) { 670 for (sort keys %a) {
… …
661 } 673 }
662 674
663 for (@kv) { 675 for (@kv) {
664 my ($k, $v) = @$_; 676 my ($k, $v) = @$_;
665 677
666 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 678 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
667 $v =~ s/\n$//; 679 $v =~ s/\n$//;
668 $str .= "$k\n$v\n$end\n"; 680 $str .= "$k\n$v\n$end\n";
669 } else { 681 } else {
670 $str .= "$k $v\n"; 682 $str .= "$k $v\n";
671 } 683 }
… …
767=cut 779=cut
768 780
769sub arch_attr($) { 781sub arch_attr($) {
770 my ($obj) = @_; 782 my ($obj) = @_;
771 783
772 require Crossfire::Data; 784 require Deliantra::Data;
773 785
774 my $root; 786 my $root;
775 my $attr = { }; 787 my $attr = { };
776 788
777 my $arch = $ARCH{ $obj->{_name} }; 789 my $arch = $ARCH{ $obj->{_name} };
778 my $type = $obj->{type} || $arch->{type}; 790 my $type = $obj->{type} || $arch->{type};
779 791
780 if ($type > 0) { 792 if ($type > 0) {
781 $root = $Crossfire::Data::ATTR{$type}; 793 $root = $Deliantra::Data::ATTR{$type};
782 } else { 794 } else {
783 my %a = (%$arch, %$obj); 795 my %a = (%$arch, %$obj);
784 796
785 if ($a{is_floor} && !$a{alive}) { 797 if ($a{is_floor} && !$a{alive}) {
786 $root = $Crossfire::Data::TYPE{Floor}; 798 $root = $Deliantra::Data::TYPE{Floor};
787 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 799 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
788 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 800 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
789 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 801 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
790 $root = $Crossfire::Data::TYPE{Wall}; 802 $root = $Deliantra::Data::TYPE{Wall};
791 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 803 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
792 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 804 $root = $Deliantra::Data::TYPE{"Weak Wall"};
793 } else { 805 } else {
794 $root = $Crossfire::Data::TYPE{Misc}; 806 $root = $Deliantra::Data::TYPE{Misc};
795 } 807 }
796 } 808 }
797 809
798 my @import = ($root); 810 my @import = ($root);
799 811
800 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 812 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
801 unless $type == 116; 813 unless $type == 116;
802 814
803 my (%ignore); 815 my (%ignore);
804 my (@section_order, %section, @attr_order); 816 my (@section_order, %section, @attr_order);
805 817
806 while (my $type = shift @import) { 818 while (my $type = shift @import) {
819 push @import,
820 grep $_,
821 map $Deliantra::Data::TYPE{$_},
807 push @import, @{$type->{import} || []}; 822 @{$type->{import} || []};
808 823
809 $attr->{$_} ||= $type->{$_} 824 $attr->{$_} ||= $type->{$_}
810 for qw(name desc use); 825 for qw(name desc use);
811 826
812 for (@{$type->{ignore} || []}) { 827 for (@{$type->{ignore} || []}) {
… …
901} 916}
902 917
903sub construct_tilecache_pb { 918sub construct_tilecache_pb {
904 my ($idx, $cache) = @_; 919 my ($idx, $cache) = @_;
905 920
906 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64; 921 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
907 922
908 while (my ($name, $tile) = each %$cache) { 923 while (my ($name, $tile) = each %$cache) {
909 my $tpb = delete $tile->{pb}; 924 my $tpb = delete $tile->{pb};
910 my $ofs = $tile->{idx}; 925 my $ofs = $tile->{idx};
911 926
912 for my $x (0 .. $tile->{w} - 1) { 927 for my $x (0 .. $tile->{w} - 1) {
913 for my $y (0 .. $tile->{h} - 1) { 928 for my $y (0 .. $tile->{h} - 1) {
914 my $idx = $ofs + $x + $y * $tile->{w}; 929 my $idx = $ofs + $x + $y * $tile->{w};
915 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE, 930 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
916 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 931 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
917 } 932 }
918 } 933 }
919 } 934 }
920 935
921 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); 936 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
… …
937=cut 952=cut
938 953
939sub load_tilecache() { 954sub load_tilecache() {
940 require Gtk2; 955 require Gtk2;
941 956
942 if (-e "$LIB/crossfire.0") { # Crossfire1 version
943 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
944 sub {
945 my $tile = read_pak "$LIB/crossfire.0";
946
947 my %cache;
948
949 my $idx = 0;
950
951 for my $name (sort keys %$tile) {
952 my $pb = new Gtk2::Gdk::PixbufLoader;
953 $pb->write ($tile->{$name});
954 $pb->close;
955 my $pb = $pb->get_pixbuf;
956
957 my $tile = $cache{$name} = {
958 pb => $pb,
959 idx => $idx,
960 w => int $pb->get_width / TILESIZE,
961 h => int $pb->get_height / TILESIZE,
962 };
963
964 $idx += $tile->{w} * $tile->{h};
965 }
966
967 construct_tilecache_pb $idx, \%cache;
968
969 \%cache
970 };
971
972 } else { # Crossfire+ version
973 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache, 957 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
974 sub { 958 sub {
975 my %cache; 959 my %cache;
976 my $facedata = Storable::retrieve "$LIB/facedata"; 960 my $facedata = Storable::retrieve "$LIB/facedata";
977 961
978 $facedata->{version} == 2 962 $facedata->{version} == 2
979 or die "$LIB/facedata: version mismatch, cannot proceed."; 963 or die "$LIB/facedata: version mismatch, cannot proceed.";
980 964
981 my $faces = $facedata->{faceinfo}; 965 my $faces = $facedata->{faceinfo};
982 my $idx = 0; 966 my $idx = 0;
983 967
984 for (sort keys %$faces) { 968 for (sort keys %$faces) {
985 my ($face, $info) = ($_, $faces->{$_}); 969 my ($face, $info) = ($_, $faces->{$_});
986 970
987 my $pb = new Gtk2::Gdk::PixbufLoader; 971 my $pb = new Gtk2::Gdk::PixbufLoader;
988 $pb->write ($info->{data32}); 972 $pb->write ($info->{data32});
989 $pb->close; 973 $pb->close;
990 my $pb = $pb->get_pixbuf; 974 my $pb = $pb->get_pixbuf;
991 975
992 my $tile = $cache{$face} = { 976 my $tile = $cache{$face} = {
993 pb => $pb, 977 pb => $pb,
994 idx => $idx, 978 idx => $idx,
995 w => int $pb->get_width / TILESIZE, 979 w => int $pb->get_width / TILESIZE,
996 h => int $pb->get_height / TILESIZE, 980 h => int $pb->get_height / TILESIZE,
997 }; 981 };
998 982
999 $idx += $tile->{w} * $tile->{h}; 983 $idx += $tile->{w} * $tile->{h};
1000 } 984 }
1001 985
1002 construct_tilecache_pb $idx, \%cache; 986 construct_tilecache_pb $idx, \%cache;
1003 987
1004 \%cache 988 \%cache
1005 }; 989 };
1006 }
1007} 990}
1008 991
1009=head1 AUTHOR 992=head1 AUTHOR
1010 993
1011 Marc Lehmann <schmorp@schmorp.de> 994 Marc Lehmann <schmorp@schmorp.de>
… …
1015 http://www.ta-sa.org/ 998 http://www.ta-sa.org/
1016 999
1017=cut 1000=cut
1018 1001
10191 10021
1003

Diff Legend

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