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.54 by root, Thu Mar 23 06:45:23 2006 UTC vs.
Revision 1.72 by root, Mon Sep 4 17:58:51 2006 UTC

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

Diff Legend

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