ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/utils/cfutil.in
(Generate patch)

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.75 by root, Mon Nov 2 11:50:20 2009 UTC vs.
Revision 1.76 by root, Tue Nov 3 14:49:39 2009 UTC

383 push @ARC, $o; 383 push @ARC, $o;
384 for (my $m = $o; $m; $m = $m->{more}) { 384 for (my $m = $o; $m; $m = $m->{more}) {
385 $ARC{$m->{_name}} = $m; 385 $ARC{$m->{_name}} = $m;
386 } 386 }
387 387
388 $o->{editor_folder} ||= $dir; 388 $o->{editor_folder} ||= "\x00$dir"; # horrible kludge
389 389
390 my $visibility = delete $o->{visibility}; 390 my $visibility = delete $o->{visibility};
391 my $magicmap = delete $o->{magicmap}; 391 my $magicmap = delete $o->{magicmap};
392 392
393 # find upper left corner :/ 393 # find upper left corner :/
677 $_->join for (@a_trs, @a_res, @a_png); 677 $_->join for (@a_trs, @a_res, @a_png);
678 678
679 print "scanning done, processing results...\n" if $VERBOSE; 679 print "scanning done, processing results...\n" if $VERBOSE;
680 { 680 {
681 # remove path prefix from editor_folder 681 # remove path prefix from editor_folder
682 $_->{editor_folder} =~ /^\x00/
682 substr $_->{editor_folder}, 0, 1 + length $path, "" 683 and substr $_->{editor_folder}, 0, 2 + length $path, ""
683 for values %ARC; 684 for values %ARC;
684 685
685 print "resolving inheritance tree...\n" if $VERBOSE; 686 print "resolving inheritance tree...\n" if $VERBOSE;
686 # resolve inherit 687 # resolve inherit
687 while () { 688 while () {
688 my $progress; 689 my $progress;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines