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.27 by root, Thu Feb 23 05:46:34 2006 UTC vs.
Revision 1.32 by root, Thu Feb 23 15:10:08 2006 UTC

… …
11use strict; 11use strict;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
15use Carp (); 15use Carp ();
16use Storable;
17use File::Spec; 16use File::Spec;
18use List::Util qw(min max); 17use List::Util qw(min max);
19 18
20#XXX: The map_* procedures scream for a map-object 19#XXX: The map_* procedures scream for a map-object
21 20
… …
44sub MOVE_FLY_LOW (){ 0x2 } 43sub MOVE_FLY_LOW (){ 0x2 }
45sub MOVE_FLY_HIGH (){ 0x4 } 44sub MOVE_FLY_HIGH (){ 0x4 }
46sub MOVE_FLYING (){ 0x6 } 45sub MOVE_FLYING (){ 0x6 }
47sub MOVE_SWIM (){ 0x8 } 46sub MOVE_SWIM (){ 0x8 }
48sub MOVE_ALL (){ 0xf } 47sub MOVE_ALL (){ 0xf }
48
49BEGIN {
50 if ($^O eq "MSWin32") {
51 eval "use FreezeThaw qw(freeze thaw)";
52 } else {
53 eval "use Storable qw(freeze thaw)";
54 }
55}
56
57sub load_ref($) {
58 my ($path) = @_;
59
60 die if $^O eq "MSWin32"; #d#
61
62 open my $fh, "<", $path
63 or die "$path: $!";
64 binmode $fh;
65 local $/;
66 thaw <$fh>
67}
68
69sub save_ref($$) {
70 my ($ref, $path) = @_;
71
72 open my $fh, ">", "$path~"
73 or die "$path~: $!";
74 binmode $fh;
75 print $fh freeze $ref;
76 close $fh;
77 rename "$path~", $path
78 or die "$path: $!";
79}
49 80
50sub normalize_arch($) { 81sub normalize_arch($) {
51 my ($ob) = @_; 82 my ($ob) = @_;
52 83
53 my $arch = $ARCH{$ob->{_name}} 84 my $arch = $ARCH{$ob->{_name}}
… …
113sub read_pak($;$) { 144sub read_pak($;$) {
114 my ($path, $cache) = @_; 145 my ($path, $cache) = @_;
115 146
116 eval { 147 eval {
117 defined $cache 148 defined $cache
118 && -e $cache
119 && -M $cache < -M $path 149 && -M $cache < -M $path
120 && Storable::retrieve ($cache) 150 && load_ref $cache
121 } or do { 151 } or do {
122 my %pak; 152 my %pak;
123 153
124 open my $fh, "<:raw", $path 154 open my $fh, "<", $path
125 or Carp::croak "$_[0]: $!"; 155 or Carp::croak "$_[0]: $!";
156 binmode $fh;
126 while (<$fh>) { 157 while (<$fh>) {
127 my ($type, $id, $len, $path) = split; 158 my ($type, $id, $len, $path) = split;
128 $path =~ s/.*\///; 159 $path =~ s/.*\///;
129 read $fh, $pak{$path}, $len; 160 read $fh, $pak{$path}, $len;
130 } 161 }
131 162
132 Storable::nstore (\%pak, $cache) 163 save_ref \%pak, $cache
133 if defined $cache; 164 if defined $cache;
134 165
135 \%pak 166 \%pak
136 } 167 }
137} 168}
… …
139sub read_arch($;$) { 170sub read_arch($;$) {
140 my ($path, $cache) = @_; 171 my ($path, $cache) = @_;
141 172
142 eval { 173 eval {
143 defined $cache 174 defined $cache
144 && -e $cache
145 && -M $cache < -M $path 175 && -M $cache < -M $path
146 && Storable::retrieve ($cache) 176 && load_ref $cache
147 } or do { 177 } or do {
148 my %arc; 178 my %arc;
149 my ($more, $prev); 179 my ($more, $prev);
150 180
151 open my $fh, "<:raw", $path 181 open my $fh, "<", $path
152 or Carp::croak "$path: $!"; 182 or Carp::croak "$path: $!";
183
184 binmode $fh;
153 185
154 my $parse_block; $parse_block = sub { 186 my $parse_block; $parse_block = sub {
155 my %arc = @_; 187 my %arc = @_;
156 188
157 while (<$fh>) { 189 while (<$fh>) {
… …
206 } 238 }
207 } 239 }
208 240
209 undef $parse_block; # work around bug in perl not freeing $fh etc. 241 undef $parse_block; # work around bug in perl not freeing $fh etc.
210 242
211 Storable::nstore (\%arc, $cache) 243 save_ref \%arc, $cache
212 if defined $cache; 244 if defined $cache;
213 245
214 \%arc 246 \%arc
215 } 247 }
216} 248}
… …
381 413
382 mkdir $cachedir, 0777; 414 mkdir $cachedir, 0777;
383 *ARCH = read_arch "$LIB/archetypes", "$cachedir/archetypes.pst"; 415 *ARCH = read_arch "$LIB/archetypes", "$cachedir/archetypes.pst";
384} 416}
385 417
386$VARDIR ||= $ENV{HOME} ? "$ENV{HOME}/crossfire" : File::Spec->tmpdir; 418$VARDIR ||= $ENV{HOME} ? "$ENV{HOME}/.crossfire" : File::Spec->tmpdir . "/crossfire";
387 419
388init $VARDIR; 420init $VARDIR;
389 421
390=head1 AUTHOR 422=head1 AUTHOR
391 423

Diff Legend

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