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.31 by root, Thu Feb 23 15:01:43 2006 UTC vs.
Revision 1.45 by root, Thu Mar 16 01:13:02 2006 UTC

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);
18 18use Storable;
19#XXX: The map_* procedures scream for a map-object
20 19
21our @EXPORT = 20our @EXPORT =
22 qw(read_pak read_arch %ARCH TILESIZE $TILE %FACE editor_archs arch_extents); 21 qw(read_pak read_arch %ARCH TILESIZE $TILE %FACE editor_archs arch_extents);
23 22
24our $LIB = $ENV{CROSSFIRE_LIBDIR} 23our $LIB = $ENV{CROSSFIRE_LIBDIR}
44sub MOVE_FLY_HIGH (){ 0x4 } 43sub MOVE_FLY_HIGH (){ 0x4 }
45sub MOVE_FLYING (){ 0x6 } 44sub MOVE_FLYING (){ 0x6 }
46sub MOVE_SWIM (){ 0x8 } 45sub MOVE_SWIM (){ 0x8 }
47sub MOVE_ALL (){ 0xf } 46sub MOVE_ALL (){ 0xf }
48 47
49BEGIN {
50 if ($^O eq "MSWin32") {
51 eval "use FreezeThaw qw(freeze thaw)";
52 } else {
53 eval "use Storable qw(freeze thaw)";
54 }
55}
56
57sub load_ref($) { 48sub load_ref($) {
58 my ($path) = @_; 49 my ($path) = @_;
59 50
60 open my $fh, "<", $path 51 open my $fh, "<", $path
61 or die "$path: $!"; 52 or die "$path: $!";
62 binmode $fh; 53 binmode $fh;
63 local $/; 54 local $/;
64 thaw <$fh> 55
56 Storable::thaw <$fh>
65} 57}
66 58
67sub save_ref($$) { 59sub save_ref($$) {
68 my ($ref, $path) = @_; 60 my ($ref, $path) = @_;
69 61
70 open my $fh, ">", "$path~" 62 open my $fh, ">", "$path~"
71 or die "$path~: $!"; 63 or die "$path~: $!";
72 binmode $fh; 64 binmode $fh;
73 print $fh freeze $ref; 65 print $fh Storable::freeze $ref;
74 close $fh; 66 close $fh;
75 rename "$path~", $path 67 rename "$path~", $path
76 or die "$path: $!"; 68 or die "$path: $!";
77} 69}
78 70
271 my ($a) = @_; 263 my ($a) = @_;
272 264
273 my $o = $ARCH{$a->{_name}} 265 my $o = $ARCH{$a->{_name}}
274 or return; 266 or return;
275 267
276 my $face = $FACE{$a->{face} || $o->{face}} 268 my $face = $FACE{$a->{face} || $o->{face} || "blank.111"}
277 or (warn "no face data found for arch '$a->{_name}'"), return; 269 or (warn "no face data found for arch '$a->{_name}'"), return;
278 270
279 if ($face->{w} > 1 || $face->{h} > 1) { 271 if ($face->{w} > 1 || $face->{h} > 1) {
280 # bigface 272 # bigface
281 return (0, 0, $face->{w} - 1, $face->{h} - 1); 273 return (0, 0, $face->{w} - 1, $face->{h} - 1);
317sub arch_attr($) { 309sub arch_attr($) {
318 my ($arch) = @_; 310 my ($arch) = @_;
319 311
320 require Crossfire::Data; 312 require Crossfire::Data;
321 313
322 my $attr; 314 my $root;
323 315
324 if ($arch->{type} > 0) { 316 if ($arch->{type} > 0) {
325 $attr = $Crossfire::Data::ATTR{$arch->{type}+0}; 317 $root = $Crossfire::Data::ATTR{$arch->{type}+0};
326 } else { 318 } else {
327 $attr = $Crossfire::Data::TYPE{Misc}; 319 $root = $Crossfire::Data::TYPE{Misc};
328 320
329 type: 321 type:
330 for (@Crossfire::Data::ATTR0) { 322 for (@Crossfire::Data::ATTR0) {
331 my $req = $_->{required} 323 my $req = $_->{required}
332 or die "internal error: ATTR0 without 'required'"; 324 or die "internal error: ATTR0 without 'required'";
333 325
326 keys %$req;
334 while (my ($k, $v) = each %$req) { 327 while (my ($k, $v) = each %$req) {
335 next type 328 next type
336 unless $arch->{$k} == $v; 329 unless $arch->{$k} == $v;
337 } 330 }
338 331
339 $attr = $_; 332 $root = $_;
333 }
334 }
335
336 my $attr = { };
337
338 my @import = (\%Crossfire::Data::DEFAULT_ATTR, $root);
339 my (%ignore);
340 my (@section_order, %section, @attr_order);
341
342 while (my $type = shift @import) {
343 push @import, @{$type->{import} || []};
344
345 $attr->{$_} ||= $type->{$_}
346 for qw(name desc use);
347
348 for (@{$type->{ignore} || []}) {
349 $ignore{$_}++ for ref $_ ? @$_ : $_;
350 }
351
352 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
353 my ($name, $attr) = @$_;
354 push @section_order, $name;
355 for (@$attr) {
356 my ($k, $v) = @$_;
357 push @attr_order, $k;
358 $section{$name}{$k} ||= $v;
340 } 359 }
360 }
341 } 361 }
342 362
343 $attr || \%Crossfire::Data::DEFAULT_ATTR; 363 $attr->{section} = [
364 map !exists $section{$_} ? () : do {
365 my $attr = delete $section{$_};
366
367 [
368 $_,
369 map exists $attr->{$_} && !$ignore{$_}
370 ? [$_ => delete $attr->{$_}] : (),
371 @attr_order
372 ]
373 },
374
375 exists $section{$_} ? [$_ => delete $section{$_}] : (),
376 @section_order
377 ];
378
379 $attr
344} 380}
345 381
346sub arch_edit_sections { 382sub arch_edit_sections {
347# if (edit_type == IGUIConstants.TILE_EDIT_NONE) 383# if (edit_type == IGUIConstants.TILE_EDIT_NONE)
348# edit_type = 0; 384# edit_type = 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines