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.71 by elmex, Thu Aug 31 21:09:32 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
165# object as in "Object xxx", i.e. archetypes
123sub normalize_object($) { 166sub normalize_object($) {
124 my ($ob) = @_; 167 my ($ob) = @_;
125 168
169 # nuke outdated or never supported fields
126 delete $ob->{$_} for qw( 170 delete $ob->{$_} for qw(
127 can_knockback can_parry can_impale can_cut can_dam_armour 171 can_knockback can_parry can_impale can_cut can_dam_armour
128 can_apply pass_thru can_pass_thru 172 can_apply pass_thru can_pass_thru
129 ); 173 );
130 174
131 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) { 175 # convert movement strings to bitsets
176 for my $attr (keys %FIELD_MOVEMENT) {
132 next unless exists $ob->{$attr}; 177 next unless exists $ob->{$attr};
178
179 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
180
133 next if $ob->{$attr} =~ /^\d+$/; 181 next if $ob->{$attr} =~ /^\d+$/;
134 182
135 my $flags = 0; 183 my $flags = 0;
136 184
137 # assume list 185 # assume list
… …
154 } 202 }
155 203
156 $ob->{$attr} = $flags; 204 $ob->{$attr} = $flags;
157 } 205 }
158 206
207 # convert outdated movement flags to new movement sets
159 if (defined (my $v = delete $ob->{no_pass})) { 208 if (defined (my $v = delete $ob->{no_pass})) {
160 $ob->{move_block} = $v ? MOVE_ALL : 0; 209 $ob->{move_block} = $v ? MOVE_ALL : 0;
161 } 210 }
162 if (defined (my $v = delete $ob->{slow_move})) { 211 if (defined (my $v = delete $ob->{slow_move})) {
163 $ob->{move_slow} |= MOVE_WALK; 212 $ob->{move_slow} |= MOVE_WALK;
164 $ob->{move_slow_penalty} = $v; 213 $ob->{move_slow_penalty} = $v;
165 } 214 }
166 if (defined (my $v = delete $ob->{walk_on})) { 215 if (defined (my $v = delete $ob->{walk_on})) {
216 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
167 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK 217 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
168 : $ob->{move_on} & ~MOVE_WALK; 218 : $ob->{move_on} & ~MOVE_WALK;
169 } 219 }
170 if (defined (my $v = delete $ob->{walk_off})) { 220 if (defined (my $v = delete $ob->{walk_off})) {
221 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
171 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK 222 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
172 : $ob->{move_off} & ~MOVE_WALK; 223 : $ob->{move_off} & ~MOVE_WALK;
173 } 224 }
174 if (defined (my $v = delete $ob->{fly_on})) { 225 if (defined (my $v = delete $ob->{fly_on})) {
226 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
175 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW 227 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
176 : $ob->{move_on} & ~MOVE_FLY_LOW; 228 : $ob->{move_on} & ~MOVE_FLY_LOW;
177 } 229 }
178 if (defined (my $v = delete $ob->{fly_off})) { 230 if (defined (my $v = delete $ob->{fly_off})) {
231 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
179 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW 232 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
180 : $ob->{move_off} & ~MOVE_FLY_LOW; 233 : $ob->{move_off} & ~MOVE_FLY_LOW;
181 } 234 }
182 if (defined (my $v = delete $ob->{flying})) { 235 if (defined (my $v = delete $ob->{flying})) {
236 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type};
183 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW 237 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
184 : $ob->{move_type} & ~MOVE_FLY_LOW; 238 : $ob->{move_type} & ~MOVE_FLY_LOW;
185 } 239 }
186 240
241 # convert idiotic event_xxx things into objects
242 while (my ($event, $subtype) = each %EVENT_TYPE) {
243 if (exists $ob->{"event_${event}_plugin"}) {
244 push @{$ob->{inventory}}, {
245 _name => "event_$event",
246 title => delete $ob->{"event_${event}_plugin"},
247 slaying => delete $ob->{"event_${event}"},
248 name => delete $ob->{"event_${event}_options"},
249 };
250 }
251 }
252
187 $ob 253 $ob
188} 254}
189 255
256# arch as in "arch xxx", ie.. objects
190sub normalize_arch($) { 257sub normalize_arch($) {
191 my ($ob) = @_; 258 my ($ob) = @_;
192 259
193 normalize_object $ob; 260 normalize_object $ob;
194 261
… …
221 delete $ob->{$k}; 288 delete $ob->{$k};
222 } 289 }
223 } 290 }
224 } 291 }
225 292
293 # a speciality for the editor
294 if (exists $ob->{attack_movement}) {
295 my $am = delete $ob->{attack_movement};
296 $ob->{attack_movement_bits_0_3} = $am & 15;
297 $ob->{attack_movement_bits_4_7} = $am & 240;
298 }
299
300 $ob
301}
302
303sub attr_thaw($) {
304 my ($ob) = @_;
305
306 $ob->{attach} = from_json $ob->{attach}
307 if exists $ob->{attach};
308
309 $ob
310}
311
312sub attr_freeze($) {
313 my ($ob) = @_;
314
315 $ob->{attach} = Crossfire::to_json $ob->{attach}
316 if exists $ob->{attach};
317
226 $ob 318 $ob
227} 319}
228 320
229sub read_pak($) { 321sub read_pak($) {
230 my ($path) = @_; 322 my ($path) = @_;
231 323
232 my %pak; 324 my %pak;
233 325
234 open my $fh, "<", $path 326 open my $fh, "<:raw:perlio", $path
235 or Carp::croak "$_[0]: $!"; 327 or Carp::croak "$_[0]: $!";
236 binmode $fh; 328 binmode $fh;
237 while (<$fh>) { 329 while (<$fh>) {
238 my ($type, $id, $len, $path) = split; 330 my ($type, $id, $len, $path) = split;
239 $path =~ s/.*\///; 331 $path =~ s/.*\///;
… …
241 } 333 }
242 334
243 \%pak 335 \%pak
244} 336}
245 337
246sub read_arch($) { 338sub read_arch($;$) {
247 my ($path) = @_; 339 my ($path, $toplevel) = @_;
248 340
249 my %arc; 341 my %arc;
250 my ($more, $prev); 342 my ($more, $prev);
251 343
252 open my $fh, "<", $path 344 open my $fh, "<:raw:perlio:utf8", $path
253 or Carp::croak "$path: $!"; 345 or Carp::croak "$path: $!";
254 346
255 binmode $fh; 347# binmode $fh;
256 348
257 my $parse_block; $parse_block = sub { 349 my $parse_block; $parse_block = sub {
258 my %arc = @_; 350 my %arc = @_;
259 351
260 while (<$fh>) { 352 while (<$fh>) {
261 s/\s+$//; 353 s/\s+$//;
262 if (/^end$/i) { 354 if (/^end$/i) {
263 last; 355 last;
264 } elsif (/^arch (\S+)$/) { 356 } elsif (/^arch (\S+)$/i) {
265 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 357 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
266 } elsif (/^lore$/) { 358 } elsif (/^lore$/i) {
267 while (<$fh>) { 359 while (<$fh>) {
268 last if /^endlore\s*$/i; 360 last if /^endlore\s*$/i;
269 $arc{lore} .= $_; 361 $arc{lore} .= $_;
270 } 362 }
271 } elsif (/^msg$/) { 363 } elsif (/^msg$/i) {
272 while (<$fh>) { 364 while (<$fh>) {
273 last if /^endmsg\s*$/i; 365 last if /^endmsg\s*$/i;
274 $arc{msg} .= $_; 366 $arc{msg} .= $_;
367 }
368 } elsif (/^anim$/i) {
369 while (<$fh>) {
370 last if /^mina\s*$/i;
371 chomp;
372 push @{ $arc{anim} }, $_;
275 } 373 }
276 } elsif (/^(\S+)\s*(.*)$/) { 374 } elsif (/^(\S+)\s*(.*)$/) {
277 $arc{lc $1} = $2; 375 $arc{lc $1} = $2;
278 } elsif (/^\s*($|#)/) { 376 } elsif (/^\s*($|#)/) {
279 # 377 #
… …
289 s/\s+$//; 387 s/\s+$//;
290 if (/^more$/i) { 388 if (/^more$/i) {
291 $more = $prev; 389 $more = $prev;
292 } elsif (/^object (\S+)$/i) { 390 } elsif (/^object (\S+)$/i) {
293 my $name = $1; 391 my $name = $1;
294 my $arc = normalize_object $parse_block->(_name => $name); 392 my $arc = attr_thaw normalize_object $parse_block->(_name => $name);
393 $arc->{_atype} = 'object';
295 394
296 if ($more) { 395 if ($more) {
297 $more->{more} = $arc; 396 $more->{more} = $arc;
298 } else { 397 } else {
299 $arc{$name} = $arc; 398 $arc{$name} = $arc;
300 } 399 }
301 $prev = $arc; 400 $prev = $arc;
302 $more = undef; 401 $more = undef;
303 } elsif (/^arch (\S+)$/i) { 402 } elsif (/^arch (\S+)$/i) {
403 my $name = $1;
304 push @{ $arc{arch} }, normalize_arch $parse_block->(_name => $1); 404 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name);
405 $arc->{_atype} = 'arch';
406
407 if ($more) {
408 $more->{more} = $arc;
409 } else {
410 push @{ $arc{arch} }, $arc;
411 }
412 $prev = $arc;
413 $more = undef;
414 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
415 if ($1 eq "lev_array") {
416 while (<$fh>) {
417 last if /^endplst\s*$/;
418 push @{$toplevel->{lev_array}}, $_+0;
419 }
420 } else {
421 $toplevel->{$1} = $2;
422 }
305 } elsif (/^\s*($|#)/) { 423 } elsif (/^\s*($|#)/) {
306 # 424 #
307 } else { 425 } else {
308 warn "$path: unparseable top-level line '$_'"; 426 die "$path: unparseable top-level line '$_'";
309 } 427 }
310 } 428 }
311 429
312 undef $parse_block; # work around bug in perl not freeing $fh etc. 430 undef $parse_block; # work around bug in perl not freeing $fh etc.
313 431
314 \%arc 432 \%arc
433}
434
435sub archlist_to_string {
436 my ($arch) = @_;
437
438 my $str;
439
440 my $append; $append = sub {
441 my %a = %{$_[0]};
442
443 Crossfire::attr_freeze \%a;
444 Crossfire::normalize_arch \%a;
445
446 # undo the bit-split we did before
447 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
448 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
449 | (delete $a{attack_movement_bits_4_7});
450 }
451
452 $str .= ((exists $a{_atype}) ? $a{_atype} : 'arch'). " $a{_name}\n";
453
454 my $inv = delete $a{inventory};
455 my $more = delete $a{more}; # arches do not support 'more', but old maps can contain some
456 my $anim = delete $a{anim};
457
458 my @kv;
459
460 for ($a{_name} eq "map"
461 ? @Crossfire::FIELD_ORDER_MAP
462 : @Crossfire::FIELD_ORDER) {
463 push @kv, [$_, delete $a{$_}]
464 if exists $a{$_};
465 }
466
467 for (sort keys %a) {
468 next if /^_/; # ignore our _-keys
469 push @kv, [$_, delete $a{$_}];
470 }
471
472 for (@kv) {
473 my ($k, $v) = @$_;
474
475 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) {
476 $v =~ s/\n$//;
477 $str .= "$k\n$v\n$end\n";
478 } elsif (exists $Crossfire::FIELD_MOVEMENT{$k}) {
479 if ($v & ~Crossfire::MOVE_ALL or !$v) {
480 $str .= "$k $v\n";
481
482 } elsif ($v & Crossfire::MOVE_ALLBIT) {
483 $str .= "$k all";
484
485 $str .= " -walk" unless $v & Crossfire::MOVE_WALK;
486 $str .= " -fly_low" unless $v & Crossfire::MOVE_FLY_LOW;
487 $str .= " -fly_high" unless $v & Crossfire::MOVE_FLY_HIGH;
488 $str .= " -swim" unless $v & Crossfire::MOVE_SWIM;
489 $str .= " -boat" unless $v & Crossfire::MOVE_BOAT;
490
491 $str .= "\n";
492
493 } else {
494 $str .= $k;
495
496 $str .= " walk" if $v & Crossfire::MOVE_WALK;
497 $str .= " fly_low" if $v & Crossfire::MOVE_FLY_LOW;
498 $str .= " fly_high" if $v & Crossfire::MOVE_FLY_HIGH;
499 $str .= " swim" if $v & Crossfire::MOVE_SWIM;
500 $str .= " boat" if $v & Crossfire::MOVE_BOAT;
501
502 $str .= "\n";
503 }
504 } else {
505 $str .= "$k $v\n";
506 }
507 }
508
509 if ($inv) {
510 $append->($_) for @$inv;
511 }
512
513 if ($a{_atype} eq 'object') {
514 $str .= join "\n", "anim", @$anim, "mina\n"
515 if $anim;
516 }
517
518 $str .= "end\n";
519
520 if (($a{_atype} eq 'object') && $more) {
521 $str .= "\nmore\n";
522 $append->($more) if $more;
523 }
524 };
525
526 for (@$arch) {
527 $append->($_);
528 }
529
530 $str
315} 531}
316 532
317# put all archs into a hash with editor_face as it's key 533# put all archs into a hash with editor_face as it's key
318# NOTE: the arrays in the hash values are references to 534# NOTE: the arrays in the hash values are references to
319# the archs from $ARCH 535# the archs from $ARCH
320sub editor_archs { 536sub editor_archs {
321 my %paths; 537 my %paths;
322 538
323 for (keys %ARCH) { 539 for (keys %ARCH) {
324 my $arch = $ARCH{$_}; 540 my $arch = $ARCH{$_};
325 push @{$paths{$arch->{editor_folder}}}, \$arch; 541 push @{$paths{$arch->{editor_folder}}}, $arch;
326 } 542 }
327 543
328 \%paths 544 \%paths
329} 545}
330 546
… …
395 my $type = $obj->{type} || $arch->{type}; 611 my $type = $obj->{type} || $arch->{type};
396 612
397 if ($type > 0) { 613 if ($type > 0) {
398 $root = $Crossfire::Data::ATTR{$type}; 614 $root = $Crossfire::Data::ATTR{$type};
399 } else { 615 } else {
616 my %a = (%$arch, %$obj);
617
618 if ($a{is_floor} && !$a{alive}) {
619 $root = $Crossfire::Data::TYPE{Floor};
620 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
621 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
622 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
623 $root = $Crossfire::Data::TYPE{Wall};
624 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
625 $root = $Crossfire::Data::TYPE{"Weak Wall"};
626 } else {
400 $root = $Crossfire::Data::TYPE{Misc}; 627 $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 } 628 }
415 } 629 }
416 630
417 my @import = ($root); 631 my @import = ($root);
418 632
… …
592 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 806 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
593 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 807 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
594 or die "$VARDIR/tilecache.png: $!"; 808 or die "$VARDIR/tilecache.png: $!";
595 *FACE = $_[0]; 809 *FACE = $_[0];
596 }, sub { 810 }, sub {
597 require File::Temp;
598
599 my $tile = read_pak "$LIB/crossfire.0"; 811 my $tile = read_pak "$LIB/crossfire.0";
600 812
601 my %cache; 813 my %cache;
602 814
603 my $idx = 0; 815 my $idx = 0;
604 816
605 for my $name (sort keys %$tile) { 817 for my $name (sort keys %$tile) {
606 my ($fh, $filename) = File::Temp::tempfile (); 818 my $pb = new Gtk2::Gdk::PixbufLoader;
607 print $fh $tile->{$name}; 819 $pb->write ($tile->{$name});
608 close $fh; 820 $pb->close;
609 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 821 my $pb = $pb->get_pixbuf;
610 unlink $filename;
611 822
612 my $tile = $cache{$name} = { 823 my $tile = $cache{$name} = {
613 pb => $pb, 824 pb => $pb,
614 idx => $idx, 825 idx => $idx,
615 w => int $pb->get_width / TILESIZE, 826 w => int $pb->get_width / TILESIZE,
… …
633 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 844 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
634 } 845 }
635 } 846 }
636 } 847 }
637 848
638 $pb->save ("$VARDIR/tilecache.png", "png"); 849 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
639 850
640 \%cache 851 \%cache
641 }; 852 };
642} 853}
643 854

Diff Legend

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