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.232 by root, Wed Apr 4 02:07:19 2007 UTC vs.
Revision 1.237 by root, Fri Apr 13 05:08:51 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
… …
963} 965}
964 966
965sub path($) { 967sub path($) {
966 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 968 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
967 969
968 (playerdir $login) . "/$login.pl" 970 (playerdir $login) . "/playerdata"
969} 971}
970 972
971sub find_active($) { 973sub find_active($) {
972 $cf::PLAYER{$_[0]} 974 $cf::PLAYER{$_[0]}
973 and $cf::PLAYER{$_[0]}->active 975 and $cf::PLAYER{$_[0]}->active
… …
986 my $login = $_[0]; 988 my $login = $_[0];
987 989
988 my $guard = cf::lock_acquire "user_find:$login"; 990 my $guard = cf::lock_acquire "user_find:$login";
989 991
990 $cf::PLAYER{$_[0]} || do { 992 $cf::PLAYER{$_[0]} || do {
993 # rename old playerfiles to new ones
994 #TODO: remove when no longer required
995 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
996 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
997 aio_unlink +(playerdir $login) . "/$login.pl.pst";
998 aio_unlink +(playerdir $login) . "/$login.pl";
999
991 my $pl = load_pl path $login 1000 my $pl = load_pl path $login
992 or return; 1001 or return;
993 $cf::PLAYER{$login} = $pl 1002 $cf::PLAYER{$login} = $pl
994 } 1003 }
995 } 1004 }
… …
1965 1974
1966 return unless $self->type == cf::PLAYER; 1975 return unless $self->type == cf::PLAYER;
1967 1976
1968 if ($exit->slaying eq "/!") { 1977 if ($exit->slaying eq "/!") {
1969 #TODO: this should de-fi-ni-te-ly not be a sync-job 1978 #TODO: this should de-fi-ni-te-ly not be a sync-job
1979 # the problem is that $exit might not survive long enough
1980 # so it needs to be done right now, right here
1970 cf::sync_job { prepare_random_map $exit }; 1981 cf::sync_job { prepare_random_map $exit };
1971 } 1982 }
1972 1983
1973 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 1984 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1974 my $hp = $exit->stats->hp; 1985 my $hp = $exit->stats->hp;
… …
1982 $self->goto ($slaying, $hp, $sp); 1993 $self->goto ($slaying, $hp, $sp);
1983 1994
1984 1; 1995 1;
1985 }) { 1996 }) {
1986 $self->message ("Something went wrong deep within the crossfire server. " 1997 $self->message ("Something went wrong deep within the crossfire server. "
1987 . "I'll try to bring you back to the map you were before. " 1998 . "I'll try to bring you back to the map you were before. "
1988 . "Please report this to the dungeon master!", 1999 . "Please report this to the dungeon master!",
1989 cf::NDI_UNIQUE | cf::NDI_RED); 2000 cf::NDI_UNIQUE | cf::NDI_RED);
1990 2001
1991 warn "ERROR in enter_exit: $@"; 2002 warn "ERROR in enter_exit: $@";
1992 $self->leave_link; 2003 $self->leave_link;
1993 } 2004 }
1994 })->prio (1); 2005 })->prio (1);
… …
2298sub load_facedata { 2309sub load_facedata {
2299 my $path = sprintf "%s/facedata", cf::datadir; 2310 my $path = sprintf "%s/facedata", cf::datadir;
2300 2311
2301 warn "loading facedata from $path\n"; 2312 warn "loading facedata from $path\n";
2302 2313
2303 my $faces; 2314 my $facedata;
2304 0 < aio_load $path, $faces 2315 0 < aio_load $path, $facedata
2305 or die "$path: $!"; 2316 or die "$path: $!";
2306 2317
2307 Coro::cede;
2308 $faces = Storable::thaw $faces; 2318 $facedata = Coro::Storable::thaw $facedata;
2309 Coro::cede;
2310 2319
2311 my $meta = delete $faces->{""};
2312 $meta->{version} == 1 2320 $facedata->{version} == 2
2313 or cf::cleanup "$path: version mismatch, cannot proceed."; 2321 or cf::cleanup "$path: version mismatch, cannot proceed.";
2314 2322
2323 {
2324 my $faces = $facedata->{faceinfo};
2325
2315 while (my ($face, $info) = each %$faces) { 2326 while (my ($face, $info) = each %$faces) {
2316 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2327 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2317 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2328 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2318 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2329 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2319 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2330 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2320 Coro::cede; 2331 Coro::cede;
2321 } 2332 }
2322 2333
2323 while (my ($face, $info) = each %$faces) { 2334 while (my ($face, $info) = each %$faces) {
2324 next unless $info->{smooth}; 2335 next unless $info->{smooth};
2325 my $idx = cf::face::find $face 2336 my $idx = cf::face::find $face
2326 or next; 2337 or next;
2327 if (my $smooth = cf::face::find $info->{smooth}) { 2338 if (my $smooth = cf::face::find $info->{smooth}) {
2328 cf::face::set_smooth $idx, $smooth; 2339 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2329 } else { 2340 } else {
2330 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2341 warn "smooth face '$info->{smooth}' not found for face '$face'";
2331 } 2342 }
2332 Coro::cede; 2343 Coro::cede;
2344 }
2345 }
2346
2347 {
2348 my $anims = $facedata->{animinfo};
2349
2350 while (my ($anim, $info) = each %$anims) {
2351 cf::anim::set $anim, $info->{frames}, $info->{facings};
2352 Coro::cede;
2353 }
2354
2355 cf::anim::invalidate_all; # d'oh
2333 } 2356 }
2334 2357
2335 1 2358 1
2336} 2359}
2337 2360

Diff Legend

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