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.79 by elmex, Fri Jan 5 14:17:49 2007 UTC vs.
Revision 1.80 by root, Tue Feb 6 22:08:14 2007 UTC

384sub read_arch($;$) { 384sub read_arch($;$) {
385 my ($path, $toplevel) = @_; 385 my ($path, $toplevel) = @_;
386 386
387 my %arc; 387 my %arc;
388 my ($more, $prev); 388 my ($more, $prev);
389 my $comment;
389 390
390 open my $fh, "<:raw:perlio:utf8", $path 391 open my $fh, "<:raw:perlio:utf8", $path
391 or Carp::croak "$path: $!"; 392 or Carp::croak "$path: $!";
392 393
393# binmode $fh; 394# binmode $fh;
397 398
398 while (<$fh>) { 399 while (<$fh>) {
399 s/\s+$//; 400 s/\s+$//;
400 if (/^end$/i) { 401 if (/^end$/i) {
401 last; 402 last;
403
402 } elsif (/^arch (\S+)$/i) { 404 } elsif (/^arch (\S+)$/i) {
403 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1); 405 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
406
404 } elsif (/^lore$/i) { 407 } elsif (/^lore$/i) {
405 while (<$fh>) { 408 while (<$fh>) {
406 last if /^endlore\s*$/i; 409 last if /^endlore\s*$/i;
407 $arc{lore} .= $_; 410 $arc{lore} .= $_;
408 } 411 }
417 chomp; 420 chomp;
418 push @{ $arc{anim} }, $_; 421 push @{ $arc{anim} }, $_;
419 } 422 }
420 } elsif (/^(\S+)\s*(.*)$/) { 423 } elsif (/^(\S+)\s*(.*)$/) {
421 $arc{lc $1} = $2; 424 $arc{lc $1} = $2;
422 } elsif (/^\s*($|#)/) { 425 } elsif (/^\s*#/) {
426 $arc{_comment} .= $_;
427
428 } elsif (/^\s*$/) {
423 # 429 #
424 } else { 430 } else {
425 warn "$path: unparsable line '$_' in arch $arc{_name}"; 431 warn "$path: unparsable line '$_' in arch $arc{_name}";
426 } 432 }
427 } 433 }
431 437
432 while (<$fh>) { 438 while (<$fh>) {
433 s/\s+$//; 439 s/\s+$//;
434 if (/^more$/i) { 440 if (/^more$/i) {
435 $more = $prev; 441 $more = $prev;
442 } elsif (/^\s*#/) {
443 $comment .= $_;
436 } elsif (/^object (\S+)$/i) { 444 } elsif (/^object (\S+)$/i) {
437 my $name = $1; 445 my $name = $1;
438 my $arc = attr_thaw normalize_object $parse_block->(_name => $name); 446 my $arc = attr_thaw normalize_object $parse_block->(_name => $name, _comment => $comment);
447 delete $arc{_comment} unless length $arc{_comment};
439 $arc->{_atype} = 'object'; 448 $arc->{_atype} = 'object';
440 449
441 if ($more) { 450 if ($more) {
442 $more->{more} = $arc; 451 $more->{more} = $arc;
443 } else { 452 } else {
445 } 454 }
446 $prev = $arc; 455 $prev = $arc;
447 $more = undef; 456 $more = undef;
448 } elsif (/^arch (\S+)$/i) { 457 } elsif (/^arch (\S+)$/i) {
449 my $name = $1; 458 my $name = $1;
450 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name); 459 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name, _comment => $comment);
460 delete $arc{_comment} unless length $arc{_comment};
451 $arc->{_atype} = 'arch'; 461 $arc->{_atype} = 'arch';
452 462
453 if ($more) { 463 if ($more) {
454 $more->{more} = $arc; 464 $more->{more} = $arc;
455 } else { 465 } else {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines