ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.234 by root, Thu Apr 5 13:44:31 2007 UTC vs.
Revision 1.238 by root, Sat Apr 14 07:23:00 2007 UTC

… …
16use Coro::Event; 16use Coro::Event;
17use Coro::Timer; 17use Coro::Timer;
18use Coro::Signal; 18use Coro::Signal;
19use Coro::Semaphore; 19use Coro::Semaphore;
20use Coro::AIO; 20use Coro::AIO;
21use Coro::Storable;
21 22
22use BDB (); 23use BDB ();
23use Data::Dumper; 24use Data::Dumper;
24use Digest::MD5; 25use Digest::MD5;
25use Fcntl; 26use Fcntl;
… …
28use Time::HiRes; 29use Time::HiRes;
29use Compress::LZF; 30use Compress::LZF;
30 31
31# configure various modules to our taste 32# configure various modules to our taste
32# 33#
34$Storable::canonical = 1; # reduce rsync transfers
33Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 35Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
34Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 36Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35 37
36$Event::Eval = 1; # no idea why this is required, but it is 38$Event::Eval = 1; # no idea why this is required, but it is
37 39
… …
1157 my ($self, $type, %msg) = @_; 1159 my ($self, $type, %msg) = @_;
1158 1160
1159 $self->ns->ext_event ($type, %msg); 1161 $self->ns->ext_event ($type, %msg);
1160} 1162}
1161 1163
1162package cf; 1164=head3 cf::region
1165
1166=over 4
1167
1168=cut
1169
1170package cf::region;
1171
1172=item cf::region::find_by_path $path
1173
1174Tries to decuce the probable region for a map knowing only its path.
1175
1176=cut
1177
1178sub find_by_path($) {
1179 my ($path) = @_;
1180
1181 my ($match, $specificity);
1182
1183 for my $region (list) {
1184 if ($region->match && $path =~ $region->match) {
1185 ($match, $specificity) = ($region, $region->specificity)
1186 if $region->specificity > $specificity;
1187 }
1188 }
1189
1190 $match
1191}
1163 1192
1164=back 1193=back
1165
1166 1194
1167=head3 cf::map 1195=head3 cf::map
1168 1196
1169=over 4 1197=over 4
1170 1198
… …
1401 $self->load_header_orig 1429 $self->load_header_orig
1402 or return; 1430 or return;
1403 $self->prepare_orig; 1431 $self->prepare_orig;
1404 } 1432 }
1405 1433
1434 $self->default_region (cf::region::find_by_path $self->{path})
1435 unless $self->default_region;
1436
1406 1 1437 1
1407} 1438}
1408 1439
1409sub find; 1440sub find;
1410sub find { 1441sub find {
… …
2307sub load_facedata { 2338sub load_facedata {
2308 my $path = sprintf "%s/facedata", cf::datadir; 2339 my $path = sprintf "%s/facedata", cf::datadir;
2309 2340
2310 warn "loading facedata from $path\n"; 2341 warn "loading facedata from $path\n";
2311 2342
2312 my $faces; 2343 my $facedata;
2313 0 < aio_load $path, $faces 2344 0 < aio_load $path, $facedata
2314 or die "$path: $!"; 2345 or die "$path: $!";
2315 2346
2316 Coro::cede;
2317 $faces = Storable::thaw $faces; 2347 $facedata = Coro::Storable::thaw $facedata;
2318 Coro::cede;
2319 2348
2320 my $meta = delete $faces->{""};
2321 $meta->{version} == 1 2349 $facedata->{version} == 2
2322 or cf::cleanup "$path: version mismatch, cannot proceed."; 2350 or cf::cleanup "$path: version mismatch, cannot proceed.";
2323 2351
2352 {
2353 my $faces = $facedata->{faceinfo};
2354
2324 while (my ($face, $info) = each %$faces) { 2355 while (my ($face, $info) = each %$faces) {
2325 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2356 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2326 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2357 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2327 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2358 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2328 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2359 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2329 Coro::cede; 2360 Coro::cede;
2330 } 2361 }
2331 2362
2332 while (my ($face, $info) = each %$faces) { 2363 while (my ($face, $info) = each %$faces) {
2333 next unless $info->{smooth}; 2364 next unless $info->{smooth};
2334 my $idx = cf::face::find $face 2365 my $idx = cf::face::find $face
2335 or next; 2366 or next;
2336 if (my $smooth = cf::face::find $info->{smooth}) { 2367 if (my $smooth = cf::face::find $info->{smooth}) {
2337 cf::face::set_smooth $idx, $smooth; 2368 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2338 } else { 2369 } else {
2339 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2370 warn "smooth face '$info->{smooth}' not found for face '$face'";
2340 } 2371 }
2341 Coro::cede; 2372 Coro::cede;
2373 }
2374 }
2375
2376 {
2377 my $anims = $facedata->{animinfo};
2378
2379 while (my ($anim, $info) = each %$anims) {
2380 cf::anim::set $anim, $info->{frames}, $info->{facings};
2381 Coro::cede;
2382 }
2383
2384 cf::anim::invalidate_all; # d'oh
2342 } 2385 }
2343 2386
2344 1 2387 1
2345} 2388}
2346 2389

Diff Legend

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