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.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
… …
44 qw(move_type move_block move_allow move_on move_off move_slow); 56 qw(move_type move_block move_allow move_on move_off move_slow);
45 57
46# same as in server save routine, to (hopefully) be compatible 58# same as in server save routine, to (hopefully) be compatible
47# to the other editors. 59# to the other editors.
48our @FIELD_ORDER_MAP = (qw( 60our @FIELD_ORDER_MAP = (qw(
49 name swap_time reset_timeout fixed_resettime difficulty region 61 name attach swap_time reset_timeout fixed_resettime difficulty region
50 shopitems shopgreed shopmin shopmax shoprace 62 shopitems shopgreed shopmin shopmax shoprace
51 darkness width height enter_x enter_y msg maplore 63 darkness width height enter_x enter_y msg maplore
52 unique template 64 unique template
53 outdoor temp pressure humid windspeed winddir sky nosmooth 65 outdoor temp pressure humid windspeed winddir sky nosmooth
54 tile_path_1 tile_path_2 tile_path_3 tile_path_4 66 tile_path_1 tile_path_2 tile_path_3 tile_path_4
55)); 67));
56 68
57our @FIELD_ORDER = (qw( 69our @FIELD_ORDER = (qw(
58 elevation 70 elevation
59 71
60 name name_pl custom_name title race 72 name name_pl custom_name attach title race
61 slaying skill msg lore other_arch face 73 slaying skill msg lore other_arch face
62 #todo-events 74 #todo-events
63 animation is_animated 75 animation is_animated
64 Str Dex Con Wis Pow Cha Int 76 str dex con wis pow cha int
65 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
66 exp perm_exp expmul 78 exp perm_exp expmul
67 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
68 nrof level direction type subtype 80 nrof level direction type subtype attacktype
69 81
70 resist_physical resist_magic resist_fire resist_electricity 82 resist_physical resist_magic resist_fire resist_electricity
71 resist_cold resist_confusion resist_acid resist_drain 83 resist_cold resist_confusion resist_acid resist_drain
72 resist_weaponmagic resist_ghosthit resist_poison resist_slow 84 resist_weaponmagic resist_ghosthit resist_poison resist_slow
73 resist_paralyze resist_turn_undead resist_fear resist_cancellation 85 resist_paralyze resist_turn_undead resist_fear resist_cancellation
… …
102 114
103 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
104 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
105)); 117));
106 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
107sub MOVE_WALK (){ 0x01 } 134sub MOVE_WALK (){ 0x01 }
108sub MOVE_FLY_LOW (){ 0x02 } 135sub MOVE_FLY_LOW (){ 0x02 }
109sub MOVE_FLY_HIGH (){ 0x04 } 136sub MOVE_FLY_HIGH (){ 0x04 }
110sub MOVE_FLYING (){ 0x06 } 137sub MOVE_FLYING (){ 0x06 }
111sub MOVE_SWIM (){ 0x08 } 138sub MOVE_SWIM (){ 0x08 }
… …
115sub MOVE_ALL (){ 0x1001f } # very special value, more PITA 142sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
116 143
117sub load_ref($) { 144sub load_ref($) {
118 my ($path) = @_; 145 my ($path) = @_;
119 146
120 open my $fh, "<", $path 147 open my $fh, "<:raw:perlio", $path
121 or die "$path: $!"; 148 or die "$path: $!";
122 binmode $fh;
123 local $/; 149 local $/;
124 150
125 thaw <$fh> 151 thaw <$fh>
126} 152}
127 153
128sub save_ref($$) { 154sub save_ref($$) {
129 my ($ref, $path) = @_; 155 my ($ref, $path) = @_;
130 156
131 open my $fh, ">", "$path~" 157 open my $fh, ">:raw:perlio", "$path~"
132 or die "$path~: $!"; 158 or die "$path~: $!";
133 binmode $fh;
134 print $fh freeze $ref; 159 print $fh freeze $ref;
135 close $fh; 160 close $fh;
136 rename "$path~", $path 161 rename "$path~", $path
137 or die "$path: $!"; 162 or die "$path: $!";
138} 163}
139 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
140sub normalize_object($) { 203sub normalize_object($) {
141 my ($ob) = @_; 204 my ($ob) = @_;
142 205
206 # nuke outdated or never supported fields
143 delete $ob->{$_} for qw( 207 delete @$ob{qw(
144 can_knockback can_parry can_impale can_cut can_dam_armour 208 can_knockback can_parry can_impale can_cut can_dam_armour
145 can_apply pass_thru can_pass_thru 209 can_apply pass_thru can_pass_thru
146 ); 210 )};
147 211
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
148 for my $attr (keys %FIELD_MOVEMENT) { 217 for my $attr (keys %FIELD_MOVEMENT) {
149 next unless exists $ob->{$attr}; 218 next unless exists $ob->{$attr};
150 219
151 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility 220 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
152 221
… …
174 } 243 }
175 244
176 $ob->{$attr} = $flags; 245 $ob->{$attr} = $flags;
177 } 246 }
178 247
248 # convert outdated movement flags to new movement sets
179 if (defined (my $v = delete $ob->{no_pass})) { 249 if (defined (my $v = delete $ob->{no_pass})) {
180 $ob->{move_block} = $v ? MOVE_ALL : 0; 250 $ob->{move_block} = $v ? MOVE_ALL : 0;
181 } 251 }
182 if (defined (my $v = delete $ob->{slow_move})) { 252 if (defined (my $v = delete $ob->{slow_move})) {
183 $ob->{move_slow} |= MOVE_WALK; 253 $ob->{move_slow} |= MOVE_WALK;
184 $ob->{move_slow_penalty} = $v; 254 $ob->{move_slow_penalty} = $v;
185 } 255 }
186 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};
187 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 258 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
188 : $ob->{move_on} & ~MOVE_WALK; 259 : $ob->{move_on} & ~MOVE_WALK;
189 } 260 }
190 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};
191 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 263 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
192 : $ob->{move_off} & ~MOVE_WALK; 264 : $ob->{move_off} & ~MOVE_WALK;
193 } 265 }
194 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};
195 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 268 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
196 : $ob->{move_on} & ~MOVE_FLY_LOW; 269 : $ob->{move_on} & ~MOVE_FLY_LOW;
197 } 270 }
198 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};
199 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 273 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
200 : $ob->{move_off} & ~MOVE_FLY_LOW; 274 : $ob->{move_off} & ~MOVE_FLY_LOW;
201 } 275 }
202 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};
203 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 278 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
204 : $ob->{move_type} & ~MOVE_FLY_LOW; 279 : $ob->{move_type} & ~MOVE_FLY_LOW;
205 } 280 }
206 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
207 $ob 294 $ob
208} 295}
209 296
297# arch as in "arch xxx", ie.. objects
210sub normalize_arch($) { 298sub normalize_arch($) {
211 my ($ob) = @_; 299 my ($ob) = @_;
212 300
213 normalize_object $ob; 301 normalize_object $ob;
214 302
… …
251 } 339 }
252 340
253 $ob 341 $ob
254} 342}
255 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
359 $ob
360}
361
256sub read_pak($) { 362sub read_pak($) {
257 my ($path) = @_; 363 my ($path) = @_;
258 364
259 my %pak; 365 my %pak;
260 366
261 open my $fh, "<", $path 367 open my $fh, "<:raw:perlio", $path
262 or Carp::croak "$_[0]: $!"; 368 or Carp::croak "$_[0]: $!";
263 binmode $fh; 369 binmode $fh;
264 while (<$fh>) { 370 while (<$fh>) {
265 my ($type, $id, $len, $path) = split; 371 my ($type, $id, $len, $path) = split;
266 $path =~ s/.*\///; 372 $path =~ s/.*\///;
… …
268 } 374 }
269 375
270 \%pak 376 \%pak
271} 377}
272 378
273sub read_arch($) { 379sub read_arch($;$) {
274 my ($path) = @_; 380 my ($path, $toplevel) = @_;
275 381
276 my %arc; 382 my %arc;
277 my ($more, $prev); 383 my ($more, $prev);
278 384
279 open my $fh, "<", $path 385 open my $fh, "<:raw:perlio:utf8", $path
280 or Carp::croak "$path: $!"; 386 or Carp::croak "$path: $!";
281 387
282 binmode $fh; 388# binmode $fh;
283 389
284 my $parse_block; $parse_block = sub { 390 my $parse_block; $parse_block = sub {
285 my %arc = @_; 391 my %arc = @_;
286 392
287 while (<$fh>) { 393 while (<$fh>) {
288 s/\s+$//; 394 s/\s+$//;
289 if (/^end$/i) { 395 if (/^end$/i) {
290 last; 396 last;
291 } elsif (/^arch (\S+)$/i) { 397 } elsif (/^arch (\S+)$/i) {
292 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 398 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
293 } elsif (/^lore$/i) { 399 } elsif (/^lore$/i) {
294 while (<$fh>) { 400 while (<$fh>) {
295 last if /^endlore\s*$/i; 401 last if /^endlore\s*$/i;
296 $arc{lore} .= $_; 402 $arc{lore} .= $_;
297 } 403 }
298 } elsif (/^msg$/i) { 404 } elsif (/^msg$/i) {
299 while (<$fh>) { 405 while (<$fh>) {
300 last if /^endmsg\s*$/i; 406 last if /^endmsg\s*$/i;
301 $arc{msg} .= $_; 407 $arc{msg} .= $_;
302 } 408 }
409 } elsif (/^anim$/i) {
410 while (<$fh>) {
411 last if /^mina\s*$/i;
412 chomp;
413 push @{ $arc{anim} }, $_;
414 }
303 } elsif (/^(\S+)\s*(.*)$/) { 415 } elsif (/^(\S+)\s*(.*)$/) {
304 $arc{lc $1} = $2; 416 $arc{lc $1} = $2;
305 } elsif (/^\s*($|#)/) { 417 } elsif (/^\s*($|#)/) {
306 # 418 #
307 } else { 419 } else {
… …
316 s/\s+$//; 428 s/\s+$//;
317 if (/^more$/i) { 429 if (/^more$/i) {
318 $more = $prev; 430 $more = $prev;
319 } elsif (/^object (\S+)$/i) { 431 } elsif (/^object (\S+)$/i) {
320 my $name = $1; 432 my $name = $1;
321 my $arc = normalize_object $parse_block->(_name => $name); 433 my $arc = attr_thaw normalize_object $parse_block->(_name => $name);
434 $arc->{_atype} = 'object';
322 435
323 if ($more) { 436 if ($more) {
324 $more->{more} = $arc; 437 $more->{more} = $arc;
325 } else { 438 } else {
326 $arc{$name} = $arc; 439 $arc{$name} = $arc;
327 } 440 }
328 $prev = $arc; 441 $prev = $arc;
329 $more = undef; 442 $more = undef;
330 } elsif (/^arch (\S+)$/i) { 443 } elsif (/^arch (\S+)$/i) {
331 my $name = $1; 444 my $name = $1;
332 my $arc = normalize_arch $parse_block->(_name => $name); 445 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name);
446 $arc->{_atype} = 'arch';
333 447
334 if ($more) { 448 if ($more) {
335 $more->{more} = $arc; 449 $more->{more} = $arc;
336 } else { 450 } else {
337 push @{ $arc{arch} }, $arc; 451 push @{ $arc{arch} }, $arc;
338 } 452 }
339 $prev = $arc; 453 $prev = $arc;
340 $more = undef; 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 }
341 } elsif (/^\s*($|#)/) { 464 } elsif (/^\s*($|#)/) {
342 # 465 #
343 } else { 466 } else {
344 warn "$path: unparseable top-level line '$_'"; 467 die "$path: unparseable top-level line '$_'";
345 } 468 }
346 } 469 }
347 470
348 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.
349 472
350 \%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
351} 572}
352 573
353# 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
354# NOTE: the arrays in the hash values are references to 575# NOTE: the arrays in the hash values are references to
355# the archs from $ARCH 576# the archs from $ARCH
356sub editor_archs { 577sub editor_archs {
357 my %paths; 578 my %paths;
358 579
359 for (keys %ARCH) { 580 for (keys %ARCH) {
360 my $arch = $ARCH{$_}; 581 my $arch = $ARCH{$_};
361 push @{$paths{$arch->{editor_folder}}}, \$arch; 582 push @{$paths{$arch->{editor_folder}}}, $arch;
362 } 583 }
363 584
364 \%paths 585 \%paths
365} 586}
366 587
… …
431 my $type = $obj->{type} || $arch->{type}; 652 my $type = $obj->{type} || $arch->{type};
432 653
433 if ($type > 0) { 654 if ($type > 0) {
434 $root = $Crossfire::Data::ATTR{$type}; 655 $root = $Crossfire::Data::ATTR{$type};
435 } 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 {
436 $root = $Crossfire::Data::TYPE{Misc}; 668 $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 } 669 }
451 } 670 }
452 671
453 my @import = ($root); 672 my @import = ($root);
454 673
… …
628 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 847 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
629 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 848 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
630 or die "$VARDIR/tilecache.png: $!"; 849 or die "$VARDIR/tilecache.png: $!";
631 *FACE = $_[0]; 850 *FACE = $_[0];
632 }, sub { 851 }, sub {
633 require File::Temp;
634
635 my $tile = read_pak "$LIB/crossfire.0"; 852 my $tile = read_pak "$LIB/crossfire.0";
636 853
637 my %cache; 854 my %cache;
638 855
639 my $idx = 0; 856 my $idx = 0;
640 857
641 for my $name (sort keys %$tile) { 858 for my $name (sort keys %$tile) {
642 my ($fh, $filename) = File::Temp::tempfile (); 859 my $pb = new Gtk2::Gdk::PixbufLoader;
643 print $fh $tile->{$name}; 860 $pb->write ($tile->{$name});
644 close $fh; 861 $pb->close;
645 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 862 my $pb = $pb->get_pixbuf;
646 unlink $filename;
647 863
648 my $tile = $cache{$name} = { 864 my $tile = $cache{$name} = {
649 pb => $pb, 865 pb => $pb,
650 idx => $idx, 866 idx => $idx,
651 w => int $pb->get_width / TILESIZE, 867 w => int $pb->get_width / TILESIZE,
… …
669 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 885 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
670 } 886 }
671 } 887 }
672 } 888 }
673 889
674 $pb->save ("$VARDIR/tilecache.png", "png"); 890 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
675 891
676 \%cache 892 \%cache
677 }; 893 };
678} 894}
679 895

Diff Legend

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