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.58 by root, Thu Mar 23 20:15:08 2006 UTC vs.
Revision 1.77 by root, Tue Nov 7 22:40:26 2006 UTC

… …
4 4
5=cut 5=cut
6 6
7package Crossfire; 7package Crossfire;
8 8
9our $VERSION = '0.1'; 9our $VERSION = '0.95';
10 10
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
… …
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 *ARCH TILESIZE $TILE *FACE editor_archs arch_extents
22); 22);
23 23
24use JSON::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working
25
26sub from_json($) {
27 $JSON::Syck::ImplicitUnicode = 1;
28 JSON::Syck::Load $_[0]
29}
30
31sub to_json($) {
32 $JSON::Syck::ImplicitUnicode = 0;
33 JSON::Syck::Dump $_[0]
34}
35
24our $LIB = $ENV{CROSSFIRE_LIBDIR}; 36our $LIB = $ENV{CROSSFIRE_LIBDIR};
25 37
26our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire"; 38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire"
40 : File::Spec->tmpdir . "/crossfire";
27 41
28mkdir $VARDIR, 0777; 42mkdir $VARDIR, 0777;
29 43
30sub TILESIZE (){ 32 } 44sub TILESIZE (){ 32 }
31 45
… …
44 qw(move_type move_block move_allow move_on move_off move_slow); 58 qw(move_type move_block move_allow move_on move_off move_slow);
45 59
46# same as in server save routine, to (hopefully) be compatible 60# same as in server save routine, to (hopefully) be compatible
47# to the other editors. 61# to the other editors.
48our @FIELD_ORDER_MAP = (qw( 62our @FIELD_ORDER_MAP = (qw(
49 name swap_time reset_timeout fixed_resettime difficulty region 63 name attach swap_time reset_timeout fixed_resettime difficulty region
50 shopitems shopgreed shopmin shopmax shoprace 64 shopitems shopgreed shopmin shopmax shoprace
51 darkness width height enter_x enter_y msg maplore 65 darkness width height enter_x enter_y msg maplore
52 unique template 66 unique template
53 outdoor temp pressure humid windspeed winddir sky nosmooth 67 outdoor temp pressure humid windspeed winddir sky nosmooth
54 tile_path_1 tile_path_2 tile_path_3 tile_path_4 68 tile_path_1 tile_path_2 tile_path_3 tile_path_4
55)); 69));
56 70
57our @FIELD_ORDER = (qw( 71our @FIELD_ORDER = (qw(
58 elevation 72 elevation
59 73
60 name name_pl custom_name title race 74 name name_pl custom_name attach title race
61 slaying skill msg lore other_arch face 75 slaying skill msg lore other_arch face
62 #todo-events 76 #todo-events
63 animation is_animated 77 animation is_animated
64 Str Dex Con Wis Pow Cha Int 78 str dex con wis pow cha int
65 hp maxhp sp maxsp grace maxgrace 79 hp maxhp sp maxsp grace maxgrace
66 exp perm_exp expmul 80 exp perm_exp expmul
67 food dam luck wc ac x y speed speed_left move_state attack_movement 81 food dam luck wc ac x y speed speed_left move_state attack_movement
68 nrof level direction type subtype 82 nrof level direction type subtype attacktype
69 83
70 resist_physical resist_magic resist_fire resist_electricity 84 resist_physical resist_magic resist_fire resist_electricity
71 resist_cold resist_confusion resist_acid resist_drain 85 resist_cold resist_confusion resist_acid resist_drain
72 resist_weaponmagic resist_ghosthit resist_poison resist_slow 86 resist_weaponmagic resist_ghosthit resist_poison resist_slow
73 resist_paralyze resist_turn_undead resist_fear resist_cancellation 87 resist_paralyze resist_turn_undead resist_fear resist_cancellation
… …
102 116
103 body_range body_arm body_torso body_head body_neck body_skill 117 body_range body_arm body_torso body_head body_neck body_skill
104 body_finger body_shoulder body_foot body_hand body_wrist body_waist 118 body_finger body_shoulder body_foot body_hand body_wrist body_waist
105)); 119));
106 120
121our %EVENT_TYPE = (
122 apply => 1,
123 attack => 2,
124 death => 3,
125 drop => 4,
126 pickup => 5,
127 say => 6,
128 stop => 7,
129 time => 8,
130 throw => 9,
131 trigger => 10,
132 close => 11,
133 timer => 12,
134);
135
107sub MOVE_WALK (){ 0x01 } 136sub MOVE_WALK (){ 0x01 }
108sub MOVE_FLY_LOW (){ 0x02 } 137sub MOVE_FLY_LOW (){ 0x02 }
109sub MOVE_FLY_HIGH (){ 0x04 } 138sub MOVE_FLY_HIGH (){ 0x04 }
110sub MOVE_FLYING (){ 0x06 } 139sub MOVE_FLYING (){ 0x06 }
111sub MOVE_SWIM (){ 0x08 } 140sub MOVE_SWIM (){ 0x08 }
… …
115sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 144sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
116 145
117sub load_ref($) { 146sub load_ref($) {
118 my ($path) = @_; 147 my ($path) = @_;
119 148
120 open my $fh, "<", $path 149 open my $fh, "<:raw:perlio", $path
121 or die "$path: $!"; 150 or die "$path: $!";
122 binmode $fh;
123 local $/; 151 local $/;
124 152
125 thaw <$fh> 153 thaw <$fh>
126} 154}
127 155
128sub save_ref($$) { 156sub save_ref($$) {
129 my ($ref, $path) = @_; 157 my ($ref, $path) = @_;
130 158
131 open my $fh, ">", "$path~" 159 open my $fh, ">:raw:perlio", "$path~"
132 or die "$path~: $!"; 160 or die "$path~: $!";
133 binmode $fh;
134 print $fh freeze $ref; 161 print $fh freeze $ref;
135 close $fh; 162 close $fh;
136 rename "$path~", $path 163 rename "$path~", $path
137 or die "$path: $!"; 164 or die "$path: $!";
138} 165}
139 166
167my %attack_mask = (
168 physical => 0x00000001,
169 magic => 0x00000002,
170 fire => 0x00000004,
171 electricity => 0x00000008,
172 cold => 0x00000010,
173 confusion => 0x00000020,
174 acid => 0x00000040,
175 drain => 0x00000080,
176 weaponmagic => 0x00000100,
177 ghosthit => 0x00000200,
178 poison => 0x00000400,
179 slow => 0x00000800,
180 paralyze => 0x00001000,
181 turn_undead => 0x00002000,
182 fear => 0x00004000,
183 cancellation => 0x00008000,
184 deplete => 0x00010000,
185 death => 0x00020000,
186 chaos => 0x00040000,
187 counterspell => 0x00080000,
188 godpower => 0x00100000,
189 holyword => 0x00200000,
190 blind => 0x00400000,
191 internal => 0x00800000,
192 life_stealing => 0x01000000,
193 disease => 0x02000000,
194);
195
196sub _add_resist($$$) {
197 my ($ob, $mask, $value) = @_;
198
199 while (my ($k, $v) = each %attack_mask) {
200 $ob->{"resist_$k"} = min 100, max -100, $ob->{"resist_$k"} + $value if $mask & $v;
201 }
202}
203
204# object as in "Object xxx", i.e. archetypes
140sub normalize_object($) { 205sub normalize_object($) {
141 my ($ob) = @_; 206 my ($ob) = @_;
142 207
208 # nuke outdated or never supported fields
143 delete $ob->{$_} for qw( 209 delete @$ob{qw(
144 can_knockback can_parry can_impale can_cut can_dam_armour 210 can_knockback can_parry can_impale can_cut can_dam_armour
145 can_apply pass_thru can_pass_thru 211 can_apply pass_thru can_pass_thru
146 ); 212 )};
147 213
214 if (my $mask = delete $ob->{immune} ) { _add_resist $ob, $mask, 100; }
215 if (my $mask = delete $ob->{protected} ) { _add_resist $ob, $mask, 30; }
216 if (my $mask = delete $ob->{vulnerable}) { _add_resist $ob, $mask, -100; }
217
218 # convert movement strings to bitsets
148 for my $attr (keys %FIELD_MOVEMENT) { 219 for my $attr (keys %FIELD_MOVEMENT) {
149 next unless exists $ob->{$attr}; 220 next unless exists $ob->{$attr};
150 221
151 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 222 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
152 223
… …
174 } 245 }
175 246
176 $ob->{$attr} = $flags; 247 $ob->{$attr} = $flags;
177 } 248 }
178 249
250 # convert outdated movement flags to new movement sets
179 if (defined (my $v = delete $ob->{no_pass})) { 251 if (defined (my $v = delete $ob->{no_pass})) {
180 $ob->{move_block} = $v ? MOVE_ALL : 0; 252 $ob->{move_block} = $v ? MOVE_ALL : 0;
181 } 253 }
182 if (defined (my $v = delete $ob->{slow_move})) { 254 if (defined (my $v = delete $ob->{slow_move})) {
183 $ob->{move_slow} |= MOVE_WALK; 255 $ob->{move_slow} |= MOVE_WALK;
184 $ob->{move_slow_penalty} = $v; 256 $ob->{move_slow_penalty} = $v;
185 } 257 }
186 if (defined (my $v = delete $ob->{walk_on})) { 258 if (defined (my $v = delete $ob->{walk_on})) {
259 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
187 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 260 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
188 : $ob->{move_on} & ~MOVE_WALK; 261 : $ob->{move_on} & ~MOVE_WALK;
189 } 262 }
190 if (defined (my $v = delete $ob->{walk_off})) { 263 if (defined (my $v = delete $ob->{walk_off})) {
264 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
191 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 265 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
192 : $ob->{move_off} & ~MOVE_WALK; 266 : $ob->{move_off} & ~MOVE_WALK;
193 } 267 }
194 if (defined (my $v = delete $ob->{fly_on})) { 268 if (defined (my $v = delete $ob->{fly_on})) {
269 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
195 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 270 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
196 : $ob->{move_on} & ~MOVE_FLY_LOW; 271 : $ob->{move_on} & ~MOVE_FLY_LOW;
197 } 272 }
198 if (defined (my $v = delete $ob->{fly_off})) { 273 if (defined (my $v = delete $ob->{fly_off})) {
274 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
199 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 275 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
200 : $ob->{move_off} & ~MOVE_FLY_LOW; 276 : $ob->{move_off} & ~MOVE_FLY_LOW;
201 } 277 }
202 if (defined (my $v = delete $ob->{flying})) { 278 if (defined (my $v = delete $ob->{flying})) {
279 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type};
203 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 280 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
204 : $ob->{move_type} & ~MOVE_FLY_LOW; 281 : $ob->{move_type} & ~MOVE_FLY_LOW;
205 } 282 }
206 283
284 # convert idiotic event_xxx things into objects
285 while (my ($event, $subtype) = each %EVENT_TYPE) {
286 if (exists $ob->{"event_${event}_plugin"}) {
287 push @{$ob->{inventory}}, {
288 _name => "event_$event",
289 title => delete $ob->{"event_${event}_plugin"},
290 slaying => delete $ob->{"event_${event}"},
291 name => delete $ob->{"event_${event}_options"},
292 };
293 }
294 }
295
296 # some archetypes had "+3" instead of the canonical "3", so fix
297 $ob->{dam} *= 1 if exists $ob->{dam};
298
207 $ob 299 $ob
208} 300}
209 301
302# arch as in "arch xxx", ie.. objects
210sub normalize_arch($) { 303sub normalize_arch($) {
211 my ($ob) = @_; 304 my ($ob) = @_;
212 305
213 normalize_object $ob; 306 normalize_object $ob;
214 307
… …
251 } 344 }
252 345
253 $ob 346 $ob
254} 347}
255 348
349sub attr_thaw($) {
350 my ($ob) = @_;
351
352 $ob->{attach} = from_json $ob->{attach}
353 if exists $ob->{attach};
354
355 $ob
356}
357
358sub attr_freeze($) {
359 my ($ob) = @_;
360
361 $ob->{attach} = Crossfire::to_json $ob->{attach}
362 if exists $ob->{attach};
363
364 $ob
365}
366
256sub read_pak($) { 367sub read_pak($) {
257 my ($path) = @_; 368 my ($path) = @_;
258 369
259 my %pak; 370 my %pak;
260 371
261 open my $fh, "<", $path 372 open my $fh, "<:raw:perlio", $path
262 or Carp::croak "$_[0]: $!"; 373 or Carp::croak "$_[0]: $!";
263 binmode $fh; 374 binmode $fh;
264 while (<$fh>) { 375 while (<$fh>) {
265 my ($type, $id, $len, $path) = split; 376 my ($type, $id, $len, $path) = split;
266 $path =~ s/.*\///; 377 $path =~ s/.*\///;
… …
268 } 379 }
269 380
270 \%pak 381 \%pak
271} 382}
272 383
273sub read_arch($) { 384sub read_arch($;$) {
274 my ($path) = @_; 385 my ($path, $toplevel) = @_;
275 386
276 my %arc; 387 my %arc;
277 my ($more, $prev); 388 my ($more, $prev);
278 389
279 open my $fh, "<", $path 390 open my $fh, "<:raw:perlio:utf8", $path
280 or Carp::croak "$path: $!"; 391 or Carp::croak "$path: $!";
281 392
282 binmode $fh; 393# binmode $fh;
283 394
284 my $parse_block; $parse_block = sub { 395 my $parse_block; $parse_block = sub {
285 my %arc = @_; 396 my %arc = @_;
286 397
287 while (<$fh>) { 398 while (<$fh>) {
288 s/\s+$//; 399 s/\s+$//;
289 if (/^end$/i) { 400 if (/^end$/i) {
290 last; 401 last;
291 } elsif (/^arch (\S+)$/i) { 402 } elsif (/^arch (\S+)$/i) {
292 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 403 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
293 } elsif (/^lore$/i) { 404 } elsif (/^lore$/i) {
294 while (<$fh>) { 405 while (<$fh>) {
295 last if /^endlore\s*$/i; 406 last if /^endlore\s*$/i;
296 $arc{lore} .= $_; 407 $arc{lore} .= $_;
297 } 408 }
298 } elsif (/^msg$/i) { 409 } elsif (/^msg$/i) {
299 while (<$fh>) { 410 while (<$fh>) {
300 last if /^endmsg\s*$/i; 411 last if /^endmsg\s*$/i;
301 $arc{msg} .= $_; 412 $arc{msg} .= $_;
302 } 413 }
414 } elsif (/^anim$/i) {
415 while (<$fh>) {
416 last if /^mina\s*$/i;
417 chomp;
418 push @{ $arc{anim} }, $_;
419 }
303 } elsif (/^(\S+)\s*(.*)$/) { 420 } elsif (/^(\S+)\s*(.*)$/) {
304 $arc{lc $1} = $2; 421 $arc{lc $1} = $2;
305 } elsif (/^\s*($|#)/) { 422 } elsif (/^\s*($|#)/) {
306 # 423 #
307 } else { 424 } else {
… …
316 s/\s+$//; 433 s/\s+$//;
317 if (/^more$/i) { 434 if (/^more$/i) {
318 $more = $prev; 435 $more = $prev;
319 } elsif (/^object (\S+)$/i) { 436 } elsif (/^object (\S+)$/i) {
320 my $name = $1; 437 my $name = $1;
321 my $arc = normalize_object $parse_block->(_name => $name); 438 my $arc = attr_thaw normalize_object $parse_block->(_name => $name);
439 $arc->{_atype} = 'object';
322 440
323 if ($more) { 441 if ($more) {
324 $more->{more} = $arc; 442 $more->{more} = $arc;
325 } else { 443 } else {
326 $arc{$name} = $arc; 444 $arc{$name} = $arc;
327 } 445 }
328 $prev = $arc; 446 $prev = $arc;
329 $more = undef; 447 $more = undef;
330 } elsif (/^arch (\S+)$/i) { 448 } elsif (/^arch (\S+)$/i) {
331 my $name = $1; 449 my $name = $1;
332 my $arc = normalize_arch $parse_block->(_name => $name); 450 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name);
451 $arc->{_atype} = 'arch';
333 452
334 if ($more) { 453 if ($more) {
335 $more->{more} = $arc; 454 $more->{more} = $arc;
336 } else { 455 } else {
337 push @{ $arc{arch} }, $arc; 456 push @{ $arc{arch} }, $arc;
338 } 457 }
339 $prev = $arc; 458 $prev = $arc;
340 $more = undef; 459 $more = undef;
460 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
461 if ($1 eq "lev_array") {
462 while (<$fh>) {
463 last if /^endplst\s*$/;
464 push @{$toplevel->{lev_array}}, $_+0;
465 }
466 } else {
467 $toplevel->{$1} = $2;
468 }
341 } elsif (/^\s*($|#)/) { 469 } elsif (/^\s*($|#)/) {
342 # 470 #
343 } else { 471 } else {
344 warn "$path: unparseable top-level line '$_'"; 472 die "$path: unparseable top-level line '$_'";
345 } 473 }
346 } 474 }
347 475
348 undef $parse_block; # work around bug in perl not freeing $fh etc. 476 undef $parse_block; # work around bug in perl not freeing $fh etc.
349 477
350 \%arc 478 \%arc
479}
480
481sub archlist_to_string {
482 my ($arch) = @_;
483
484 my $str;
485
486 my $append; $append = sub {
487 my %a = %{$_[0]};
488
489 Crossfire::attr_freeze \%a;
490 Crossfire::normalize_arch \%a;
491
492 # undo the bit-split we did before
493 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
494 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
495 | (delete $a{attack_movement_bits_4_7});
496 }
497
498 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
499
500 my $inv = delete $a{inventory};
501 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
502 my $anim = delete $a{anim};
503
504 my @kv;
505
506 for ($a{_name} eq "map"
507 ? @Crossfire::FIELD_ORDER_MAP
508 : @Crossfire::FIELD_ORDER) {
509 push @kv, [$_, delete $a{$_}]
510 if exists $a{$_};
511 }
512
513 for (sort keys %a) {
514 next if /^_/; # ignore our _-keys
515 push @kv, [$_, delete $a{$_}];
516 }
517
518 for (@kv) {
519 my ($k, $v) = @$_;
520
521 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
522 $v =~ s/\n$//;
523 $str .= "$k\n$v\n$end\n";
524 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
525 if ($v & ~Crossfire::MOVE_ALL or !$v) {
526 $str .= "$k $v\n";
527
528 } elsif ($v & Crossfire::MOVE_ALLBIT) {
529 $str .= "$k all";
530
531 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
532 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
533 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
534 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
535 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
536
537 $str .= "\n";
538
539 } else {
540 $str .= $k;
541
542 $str .= " walk" if $v & Crossfire::MOVE_WALK;
543 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
544 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
545 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
546 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
547
548 $str .= "\n";
549 }
550 } else {
551 $str .= "$k $v\n";
552 }
553 }
554
555 if ($inv) {
556 $append->($_) for @$inv;
557 }
558
559 if ($a{_atype} eq 'object') {
560 $str .= join "\n", "anim", @$anim, "mina\n"
561 if $anim;
562 }
563
564 $str .= "end\n";
565
566 if (($a{_atype} eq 'object') && $more) {
567 $str .= "\nmore\n";
568 $append->($more) if $more;
569 }
570 };
571
572 for (@$arch) {
573 $append->($_);
574 }
575
576 $str
351} 577}
352 578
353# put all archs into a hash with editor_face as it's key 579# put all archs into a hash with editor_face as it's key
354# NOTE: the arrays in the hash values are references to 580# NOTE: the arrays in the hash values are references to
355# the archs from $ARCH 581# the archs from $ARCH
356sub editor_archs { 582sub editor_archs {
357 my %paths; 583 my %paths;
358 584
359 for (keys %ARCH) { 585 for (keys %ARCH) {
360 my $arch = $ARCH{$_}; 586 my $arch = $ARCH{$_};
361 push @{$paths{$arch->{editor_folder}}}, \$arch; 587 push @{$paths{$arch->{editor_folder}}}, $arch;
362 } 588 }
363 589
364 \%paths 590 \%paths
365} 591}
366 592
… …
431 my $type = $obj->{type} || $arch->{type}; 657 my $type = $obj->{type} || $arch->{type};
432 658
433 if ($type > 0) { 659 if ($type > 0) {
434 $root = $Crossfire::Data::ATTR{$type}; 660 $root = $Crossfire::Data::ATTR{$type};
435 } else { 661 } else {
662 my %a = (%$arch, %$obj);
663
664 if ($a{is_floor} && !$a{alive}) {
665 $root = $Crossfire::Data::TYPE{Floor};
666 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
667 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
668 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
669 $root = $Crossfire::Data::TYPE{Wall};
670 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
671 $root = $Crossfire::Data::TYPE{"Weak Wall"};
672 } else {
436 $root = $Crossfire::Data::TYPE{Misc}; 673 $root = $Crossfire::Data::TYPE{Misc};
437
438 type:
439 for (@Crossfire::Data::ATTR0) {
440 my $req = $_->{required}
441 or die "internal error: ATTR0 without 'required'";
442
443 keys %$req;
444 while (my ($k, $v) = each %$req) {
445 next type
446 unless $obj->{$k} == $v || $arch->{$k} == $v;
447 }
448
449 $root = $_;
450 } 674 }
451 } 675 }
452 676
453 my @import = ($root); 677 my @import = ($root);
454 678
… …
628 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 852 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
629 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 853 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
630 or die "$VARDIR/tilecache.png: $!"; 854 or die "$VARDIR/tilecache.png: $!";
631 *FACE = $_[0]; 855 *FACE = $_[0];
632 }, sub { 856 }, sub {
633 require File::Temp;
634
635 my $tile = read_pak "$LIB/crossfire.0"; 857 my $tile = read_pak "$LIB/crossfire.0";
636 858
637 my %cache; 859 my %cache;
638 860
639 my $idx = 0; 861 my $idx = 0;
640 862
641 for my $name (sort keys %$tile) { 863 for my $name (sort keys %$tile) {
642 my ($fh, $filename) = File::Temp::tempfile (); 864 my $pb = new Gtk2::Gdk::PixbufLoader;
643 print $fh $tile->{$name}; 865 $pb->write ($tile->{$name});
644 close $fh; 866 $pb->close;
645 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 867 my $pb = $pb->get_pixbuf;
646 unlink $filename;
647 868
648 my $tile = $cache{$name} = { 869 my $tile = $cache{$name} = {
649 pb => $pb, 870 pb => $pb,
650 idx => $idx, 871 idx => $idx,
651 w => int $pb->get_width / TILESIZE, 872 w => int $pb->get_width / TILESIZE,
… …
669 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 890 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
670 } 891 }
671 } 892 }
672 } 893 }
673 894
674 $pb->save ("$VARDIR/tilecache.png", "png"); 895 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
675 896
676 \%cache 897 \%cache
677 }; 898 };
678} 899}
679 900

Diff Legend

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