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.50 by root, Mon Mar 20 01:12:23 2006 UTC vs.
Revision 1.70 by root, Sun Aug 27 16:33:19 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
15use Carp (); 15use Carp ();
16use File::Spec; 16use File::Spec;
17use List::Util qw(min max); 17use List::Util qw(min max);
18use Storable; 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
42# not used yet, maybe alphabetical is ok 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
58# same as in server save routine, to (hopefully) be compatible
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
43our @FIELD_ORDER = (qw(name name_pl)); 69our @FIELD_ORDER = (qw(
70 elevation
71
72 name name_pl custom_name attach title race
73 slaying skill msg lore other_arch face
74 #todo-events
75 animation is_animated
76 str dex con wis pow cha int
77 hp maxhp sp maxsp grace maxgrace
78 exp perm_exp expmul
79 food dam luck wc ac x y speed speed_left move_state attack_movement
80 nrof level direction type subtype attacktype
81
82 resist_physical resist_magic resist_fire resist_electricity
83 resist_cold resist_confusion resist_acid resist_drain
84 resist_weaponmagic resist_ghosthit resist_poison resist_slow
85 resist_paralyze resist_turn_undead resist_fear resist_cancellation
86 resist_deplete resist_death resist_chaos resist_counterspell
87 resist_godpower resist_holyword resist_blind resist_internal
88 resist_life_stealing resist_disease
89
90 path_attuned path_repelled path_denied material materialname
91 value carrying weight invisible state magic
92 last_heal last_sp last_grace last_eat
93 connected glow_radius randomitems npx_status npc_program
94 run_away pick_up container will_apply smoothlevel
95 current_weapon_script weapontype tooltype elevation client_type
96 item_power duration range
97 range_modifier duration_modifier dam_modifier gen_sp_armour
98 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
99
100 alive wiz was_wiz applied unpaid can_use_shield no_pick is_animated monster
101 friendly generator is_thrown auto_apply treasure player sold see_invisible
102 can_roll overlay_floor is_turnable is_used_up identified reflecting changing
103 splitting hitback startequip blocksview undead scared unaggressive
104 reflect_missile reflect_spell no_magic no_fix_player is_lightable tear_down
105 run_away pick_up unique no_drop can_cast_spell can_use_scroll can_use_range
106 can_use_bow can_use_armour can_use_weapon can_use_ring has_ready_range
107 has_ready_bow xrays is_floor lifesave no_strength sleep stand_still
108 random_move only_attack confused stealth cursed damned see_anywhere
109 known_magical known_cursed can_use_skill been_applied has_ready_scroll
110 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
111 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
112 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
113 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
114
115 body_range body_arm body_torso body_head body_neck body_skill
116 body_finger body_shoulder body_foot body_hand body_wrist body_waist
117));
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);
44 133
45sub MOVE_WALK (){ 0x01 } 134sub MOVE_WALK (){ 0x01 }
46sub MOVE_FLY_LOW (){ 0x02 } 135sub MOVE_FLY_LOW (){ 0x02 }
47sub MOVE_FLY_HIGH (){ 0x04 } 136sub MOVE_FLY_HIGH (){ 0x04 }
48sub MOVE_FLYING (){ 0x06 } 137sub MOVE_FLYING (){ 0x06 }
49sub MOVE_SWIM (){ 0x08 } 138sub MOVE_SWIM (){ 0x08 }
50sub MOVE_BOAT (){ 0x10 } 139sub MOVE_BOAT (){ 0x10 }
140sub MOVE_KNOWN (){ 0x1f } # all of above
51sub MOVE_ALL (){ 0xff } 141sub MOVE_ALLBIT (){ 0x10000 }
142sub MOVE_ALL (){ 0x1001f } # very special value, more PITA
52 143
53sub load_ref($) { 144sub load_ref($) {
54 my ($path) = @_; 145 my ($path) = @_;
55 146
56 open my $fh, "<", $path 147 open my $fh, "<:raw:perlio", $path
57 or die "$path: $!"; 148 or die "$path: $!";
58 binmode $fh;
59 local $/; 149 local $/;
60 150
61 Storable::thaw <$fh> 151 thaw <$fh>
62} 152}
63 153
64sub save_ref($$) { 154sub save_ref($$) {
65 my ($ref, $path) = @_; 155 my ($ref, $path) = @_;
66 156
67 open my $fh, ">", "$path~" 157 open my $fh, ">:raw:perlio", "$path~"
68 or die "$path~: $!"; 158 or die "$path~: $!";
69 binmode $fh;
70 print $fh Storable::freeze $ref; 159 print $fh freeze $ref;
71 close $fh; 160 close $fh;
72 rename "$path~", $path 161 rename "$path~", $path
73 or die "$path: $!"; 162 or die "$path: $!";
74} 163}
75 164
165# object as in "Object xxx", i.e. archetypes
76sub normalize_arch($) { 166sub normalize_object($) {
77 my ($ob) = @_; 167 my ($ob) = @_;
78 168
79 my $arch = $ARCH{$ob->{_name}} 169 # nuke outdated or never supported fields
80 or (warn "$ob->{_name}: no such archetype", return $ob);
81
82 delete $ob->{$_} for qw( 170 delete $ob->{$_} for qw(
83 can_knockback can_parry can_impale can_cut can_dam_armour 171 can_knockback can_parry can_impale can_cut can_dam_armour
84 can_apply pass_thru can_pass_thru 172 can_apply pass_thru can_pass_thru
85 ); 173 );
174
175 # convert movement strings to bitsets
176 for my $attr (keys %FIELD_MOVEMENT) {
177 next unless exists $ob->{$attr};
178
179 $ob->{$attr} = MOVE_ALL if $ob->{$attr} == 255; #d# compatibility
180
181 next if $ob->{$attr} =~ /^\d+$/;
182
183 my $flags = 0;
184
185 # assume list
186 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
187 $flags |= MOVE_WALK if $flag eq "walk";
188 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
189 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
190 $flags |= MOVE_FLYING if $flag eq "flying";
191 $flags |= MOVE_SWIM if $flag eq "swim";
192 $flags |= MOVE_BOAT if $flag eq "boat";
193 $flags |= MOVE_ALL if $flag eq "all";
194
195 $flags &= ~MOVE_WALK if $flag eq "-walk";
196 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
197 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
198 $flags &= ~MOVE_FLYING if $flag eq "-flying";
199 $flags &= ~MOVE_SWIM if $flag eq "-swim";
200 $flags &= ~MOVE_BOAT if $flag eq "-boat";
201 $flags &= ~MOVE_ALL if $flag eq "-all";
202 }
203
204 $ob->{$attr} = $flags;
205 }
206
207 # convert outdated movement flags to new movement sets
208 if (defined (my $v = delete $ob->{no_pass})) {
209 $ob->{move_block} = $v ? MOVE_ALL : 0;
210 }
211 if (defined (my $v = delete $ob->{slow_move})) {
212 $ob->{move_slow} |= MOVE_WALK;
213 $ob->{move_slow_penalty} = $v;
214 }
215 if (defined (my $v = delete $ob->{walk_on})) {
216 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
217 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
218 : $ob->{move_on} & ~MOVE_WALK;
219 }
220 if (defined (my $v = delete $ob->{walk_off})) {
221 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
222 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
223 : $ob->{move_off} & ~MOVE_WALK;
224 }
225 if (defined (my $v = delete $ob->{fly_on})) {
226 $ob->{move_on} = MOVE_ALL unless exists $ob->{move_on};
227 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
228 : $ob->{move_on} & ~MOVE_FLY_LOW;
229 }
230 if (defined (my $v = delete $ob->{fly_off})) {
231 $ob->{move_off} = MOVE_ALL unless exists $ob->{move_off};
232 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
233 : $ob->{move_off} & ~MOVE_FLY_LOW;
234 }
235 if (defined (my $v = delete $ob->{flying})) {
236 $ob->{move_type} = MOVE_ALL unless exists $ob->{move_type};
237 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
238 : $ob->{move_type} & ~MOVE_FLY_LOW;
239 }
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
253 $ob
254}
255
256# arch as in "arch xxx", ie.. objects
257sub normalize_arch($) {
258 my ($ob) = @_;
259
260 normalize_object $ob;
261
262 my $arch = $ARCH{$ob->{_name}}
263 or (warn "$ob->{_name}: no such archetype", return $ob);
86 264
87 if ($arch->{type} == 22) { # map 265 if ($arch->{type} == 22) { # map
88 my %normalize = ( 266 my %normalize = (
89 "enter_x" => "hp", 267 "enter_x" => "hp",
90 "enter_y" => "sp", 268 "enter_y" => "sp",
… …
100 while (my ($k2, $k1) = each %normalize) { 278 while (my ($k2, $k1) = each %normalize) {
101 if (defined (my $v = delete $ob->{$k1})) { 279 if (defined (my $v = delete $ob->{$k1})) {
102 $ob->{$k2} = $v; 280 $ob->{$k2} = $v;
103 } 281 }
104 } 282 }
105 } 283 } else {
106
107 for my $attr (qw(move_type move_block move_allow move_on move_off move_slow)) {
108 next unless exists $ob->{$attr};
109 next if $ob->{$attr} =~ /^\d+$/;
110
111 my $flags = 0;
112
113 # assume list
114 for my $flag (map lc, split /\s+/, $ob->{$attr}) {
115 $flags |= MOVE_WALK if $flag eq "walk";
116 $flags |= MOVE_FLY_LOW if $flag eq "fly_low";
117 $flags |= MOVE_FLY_HIGH if $flag eq "fly_high";
118 $flags |= MOVE_FLYING if $flag eq "flying";
119 $flags |= MOVE_SWIM if $flag eq "swim";
120 $flags |= MOVE_BOAT if $flag eq "boat";
121 $flags |= MOVE_ALL if $flag eq "all";
122
123 $flags &= ~MOVE_WALK if $flag eq "-walk";
124 $flags &= ~MOVE_FLY_LOW if $flag eq "-fly_low";
125 $flags &= ~MOVE_FLY_HIGH if $flag eq "-fly_high";
126 $flags &= ~MOVE_FLYING if $flag eq "-flying";
127 $flags &= ~MOVE_SWIM if $flag eq "-swim";
128 $flags &= ~MOVE_BOAT if $flag eq "-boat";
129 $flags &= ~MOVE_ALL if $flag eq "-all";
130 }
131
132 $ob->{$attr} = $flags;
133 }
134
135 if (defined (my $v = delete $ob->{no_pass})) {
136 $ob->{move_block} = $v ? MOVE_ALL : 0;
137 }
138 if (defined (my $v = delete $ob->{slow_move})) {
139 $ob->{move_slow} |= MOVE_WALK;
140 $ob->{move_slow_penalty} = $v;
141 }
142 if (defined (my $v = delete $ob->{walk_on})) {
143 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_WALK
144 : $ob->{move_on} & ~MOVE_WALK;
145 }
146 if (defined (my $v = delete $ob->{walk_off})) {
147 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_WALK
148 : $ob->{move_off} & ~MOVE_WALK;
149 }
150 if (defined (my $v = delete $ob->{fly_on})) {
151 $ob->{move_on} = $v ? $ob->{move_on} | MOVE_FLY_LOW
152 : $ob->{move_on} & ~MOVE_FLY_LOW;
153 }
154 if (defined (my $v = delete $ob->{fly_off})) {
155 $ob->{move_off} = $v ? $ob->{move_off} | MOVE_FLY_LOW
156 : $ob->{move_off} & ~MOVE_FLY_LOW;
157 }
158 if (defined (my $v = delete $ob->{flying})) {
159 $ob->{move_type} = $v ? $ob->{move_type} | MOVE_FLY_LOW
160 : $ob->{move_type} & ~MOVE_FLY_LOW;
161 }
162
163 # if value matches archetype default, delete 284 # if value matches archetype default, delete
164 while (my ($k, $v) = each %$ob) { 285 while (my ($k, $v) = each %$ob) {
165 if (exists $arch->{$k} and $arch->{$k} eq $v) { 286 if (exists $arch->{$k} and $arch->{$k} eq $v) {
166 next if $k eq "_name"; 287 next if $k eq "_name";
167 delete $ob->{$k}; 288 delete $ob->{$k};
168 } 289 }
290 }
169 } 291 }
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};
170 317
171 $ob 318 $ob
172} 319}
173 320
174sub read_pak($) { 321sub read_pak($) {
175 my ($path) = @_; 322 my ($path) = @_;
176 323
177 my %pak; 324 my %pak;
178 325
179 open my $fh, "<", $path 326 open my $fh, "<:raw:perlio", $path
180 or Carp::croak "$_[0]: $!"; 327 or Carp::croak "$_[0]: $!";
181 binmode $fh; 328 binmode $fh;
182 while (<$fh>) { 329 while (<$fh>) {
183 my ($type, $id, $len, $path) = split; 330 my ($type, $id, $len, $path) = split;
184 $path =~ s/.*\///; 331 $path =~ s/.*\///;
… …
186 } 333 }
187 334
188 \%pak 335 \%pak
189} 336}
190 337
191sub read_arch($) { 338sub read_arch($;$) {
192 my ($path) = @_; 339 my ($path, $toplevel) = @_;
193 340
194 my %arc; 341 my %arc;
195 my ($more, $prev); 342 my ($more, $prev);
196 343
197 open my $fh, "<", $path 344 open my $fh, "<:raw:perlio:utf8", $path
198 or Carp::croak "$path: $!"; 345 or Carp::croak "$path: $!";
199 346
200 binmode $fh; 347# binmode $fh;
201 348
202 my $parse_block; $parse_block = sub { 349 my $parse_block; $parse_block = sub {
203 my %arc = @_; 350 my %arc = @_;
204 351
205 while (<$fh>) { 352 while (<$fh>) {
206 s/\s+$//; 353 s/\s+$//;
207 if (/^end$/i) { 354 if (/^end$/i) {
208 last; 355 last;
209 } elsif (/^arch (\S+)$/) { 356 } elsif (/^arch (\S+)$/i) {
210 push @{ $arc{inventory} }, normalize_arch $parse_block->(_name => $1); 357 push @{ $arc{inventory} }, attr_thaw normalize_arch $parse_block->(_name => $1);
211 } elsif (/^lore$/) { 358 } elsif (/^lore$/i) {
212 while (<$fh>) { 359 while (<$fh>) {
213 last if /^endlore\s*$/i; 360 last if /^endlore\s*$/i;
214 $arc{lore} .= $_; 361 $arc{lore} .= $_;
215 } 362 }
216 } elsif (/^msg$/) { 363 } elsif (/^msg$/i) {
217 while (<$fh>) { 364 while (<$fh>) {
218 last if /^endmsg\s*$/i; 365 last if /^endmsg\s*$/i;
219 $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} }, $_;
220 } 373 }
221 } elsif (/^(\S+)\s*(.*)$/) { 374 } elsif (/^(\S+)\s*(.*)$/) {
222 $arc{lc $1} = $2; 375 $arc{lc $1} = $2;
223 } elsif (/^\s*($|#)/) { 376 } elsif (/^\s*($|#)/) {
224 # 377 #
… …
234 s/\s+$//; 387 s/\s+$//;
235 if (/^more$/i) { 388 if (/^more$/i) {
236 $more = $prev; 389 $more = $prev;
237 } elsif (/^object (\S+)$/i) { 390 } elsif (/^object (\S+)$/i) {
238 my $name = $1; 391 my $name = $1;
239 my $arc = $parse_block->(_name => $name); 392 my $arc = attr_thaw normalize_object $parse_block->(_name => $name);
240 393
241 if ($more) { 394 if ($more) {
242 $more->{more} = $arc; 395 $more->{more} = $arc;
243 } else { 396 } else {
244 $arc{$name} = $arc; 397 $arc{$name} = $arc;
245 } 398 }
246 $prev = $arc; 399 $prev = $arc;
247 $more = undef; 400 $more = undef;
248 } elsif (/^arch (\S+)$/i) { 401 } elsif (/^arch (\S+)$/i) {
402 my $name = $1;
249 push @{ $arc{arch} }, normalize_arch $parse_block->(_name => $1); 403 my $arc = attr_thaw normalize_arch $parse_block->(_name => $name);
404
405 if ($more) {
406 $more->{more} = $arc;
407 } else {
408 push @{ $arc{arch} }, $arc;
409 }
410 $prev = $arc;
411 $more = undef;
412 } elsif ($toplevel && /^(\S+)\s+(.*)$/) {
413 if ($1 eq "lev_array") {
414 while (<$fh>) {
415 last if /^endplst\s*$/;
416 push @{$toplevel->{lev_array}}, $_+0;
417 }
418 } else {
419 $toplevel->{$1} = $2;
420 }
250 } elsif (/^\s*($|#)/) { 421 } elsif (/^\s*($|#)/) {
251 # 422 #
252 } else { 423 } else {
253 warn "$path: unparseable top-level line '$_'"; 424 die "$path: unparseable top-level line '$_'";
254 } 425 }
255 } 426 }
256 427
257 undef $parse_block; # work around bug in perl not freeing $fh etc. 428 undef $parse_block; # work around bug in perl not freeing $fh etc.
258 429
… …
265sub editor_archs { 436sub editor_archs {
266 my %paths; 437 my %paths;
267 438
268 for (keys %ARCH) { 439 for (keys %ARCH) {
269 my $arch = $ARCH{$_}; 440 my $arch = $ARCH{$_};
270 push @{$paths{$arch->{editor_folder}}}, \$arch; 441 push @{$paths{$arch->{editor_folder}}}, $arch;
271 } 442 }
272 443
273 \%paths 444 \%paths
274} 445}
275 446
… …
340 my $type = $obj->{type} || $arch->{type}; 511 my $type = $obj->{type} || $arch->{type};
341 512
342 if ($type > 0) { 513 if ($type > 0) {
343 $root = $Crossfire::Data::ATTR{$type}; 514 $root = $Crossfire::Data::ATTR{$type};
344 } else { 515 } else {
516 my %a = (%$arch, %$obj);
517
518 if ($a{is_floor} && !$a{alive}) {
519 $root = $Crossfire::Data::TYPE{Floor};
520 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
521 $root = $Crossfire::Data::TYPE{"Monster & NPC"};
522 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
523 $root = $Crossfire::Data::TYPE{Wall};
524 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
525 $root = $Crossfire::Data::TYPE{"Weak Wall"};
526 } else {
345 $root = $Crossfire::Data::TYPE{Misc}; 527 $root = $Crossfire::Data::TYPE{Misc};
346
347 type:
348 for (@Crossfire::Data::ATTR0) {
349 my $req = $_->{required}
350 or die "internal error: ATTR0 without 'required'";
351
352 keys %$req;
353 while (my ($k, $v) = each %$req) {
354 next type
355 unless $obj->{$k} == $v || $arch->{$k} == $v;
356 }
357
358 $root = $_;
359 } 528 }
360 } 529 }
361 530
362 my @import = ($root); 531 my @import = ($root);
363 532
… …
469} 638}
470 639
471sub cache_file($$&&) { 640sub cache_file($$&&) {
472 my ($src, $cache, $load, $create) = @_; 641 my ($src, $cache, $load, $create) = @_;
473 642
474 warn "<@_>\n";#d#
475
476 my ($size, $mtime) = (stat $src)[7,9] 643 my ($size, $mtime) = (stat $src)[7,9]
477 or Carp::croak "$src: $!"; 644 or Carp::croak "$src: $!";
478 645
479 if (-e $cache) { 646 if (-e $cache) {
480 my $ref = eval { load_ref $cache }; 647 my $ref = eval { load_ref $cache };
… …
539 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 706 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub {
540 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png" 707 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
541 or die "$VARDIR/tilecache.png: $!"; 708 or die "$VARDIR/tilecache.png: $!";
542 *FACE = $_[0]; 709 *FACE = $_[0];
543 }, sub { 710 }, sub {
544 require File::Temp;
545
546 my $tile = read_pak "$LIB/crossfire.0"; 711 my $tile = read_pak "$LIB/crossfire.0";
547 712
548 my %cache; 713 my %cache;
549 714
550 my $idx = 0; 715 my $idx = 0;
551 716
552 for my $name (sort keys %$tile) { 717 for my $name (sort keys %$tile) {
553 my ($fh, $filename) = File::Temp::tempfile (); 718 my $pb = new Gtk2::Gdk::PixbufLoader;
554 print $fh $tile->{$name}; 719 $pb->write ($tile->{$name});
555 close $fh; 720 $pb->close;
556 my $pb = new_from_file Gtk2::Gdk::Pixbuf $filename; 721 my $pb = $pb->get_pixbuf;
557 unlink $filename;
558 722
559 my $tile = $cache{$name} = { 723 my $tile = $cache{$name} = {
560 pb => $pb, 724 pb => $pb,
561 idx => $idx, 725 idx => $idx,
562 w => int $pb->get_width / TILESIZE, 726 w => int $pb->get_width / TILESIZE,
… …
580 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 744 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
581 } 745 }
582 } 746 }
583 } 747 }
584 748
585 $pb->save ("$VARDIR/tilecache.png", "png"); 749 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
586 750
587 \%cache 751 \%cache
588 }; 752 };
589} 753}
590 754

Diff Legend

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