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.235 by root, Tue Apr 10 09:35:23 2007 UTC

… …
963} 963}
964 964
965sub path($) { 965sub path($) {
966 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 966 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
967 967
968 (playerdir $login) . "/$login.pl" 968 (playerdir $login) . "/playerdata"
969} 969}
970 970
971sub find_active($) { 971sub find_active($) {
972 $cf::PLAYER{$_[0]} 972 $cf::PLAYER{$_[0]}
973 and $cf::PLAYER{$_[0]}->active 973 and $cf::PLAYER{$_[0]}->active
… …
986 my $login = $_[0]; 986 my $login = $_[0];
987 987
988 my $guard = cf::lock_acquire "user_find:$login"; 988 my $guard = cf::lock_acquire "user_find:$login";
989 989
990 $cf::PLAYER{$_[0]} || do { 990 $cf::PLAYER{$_[0]} || do {
991 # rename old playerfiles to new ones
992 #TODO: remove when no longer required
993 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
994 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
995 aio_unlink +(playerdir $login) . "/$login.pl.pst";
996 aio_unlink +(playerdir $login) . "/$login.pl";
997
991 my $pl = load_pl path $login 998 my $pl = load_pl path $login
992 or return; 999 or return;
993 $cf::PLAYER{$login} = $pl 1000 $cf::PLAYER{$login} = $pl
994 } 1001 }
995 } 1002 }
… …
1965 1972
1966 return unless $self->type == cf::PLAYER; 1973 return unless $self->type == cf::PLAYER;
1967 1974
1968 if ($exit->slaying eq "/!") { 1975 if ($exit->slaying eq "/!") {
1969 #TODO: this should de-fi-ni-te-ly not be a sync-job 1976 #TODO: this should de-fi-ni-te-ly not be a sync-job
1977 # the problem is that $exit might not survive long enough
1978 # so it needs to be done right now, right here
1970 cf::sync_job { prepare_random_map $exit }; 1979 cf::sync_job { prepare_random_map $exit };
1971 } 1980 }
1972 1981
1973 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 1982 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1974 my $hp = $exit->stats->hp; 1983 my $hp = $exit->stats->hp;
… …
1982 $self->goto ($slaying, $hp, $sp); 1991 $self->goto ($slaying, $hp, $sp);
1983 1992
1984 1; 1993 1;
1985 }) { 1994 }) {
1986 $self->message ("Something went wrong deep within the crossfire server. " 1995 $self->message ("Something went wrong deep within the crossfire server. "
1987 . "I'll try to bring you back to the map you were before. " 1996 . "I'll try to bring you back to the map you were before. "
1988 . "Please report this to the dungeon master!", 1997 . "Please report this to the dungeon master!",
1989 cf::NDI_UNIQUE | cf::NDI_RED); 1998 cf::NDI_UNIQUE | cf::NDI_RED);
1990 1999
1991 warn "ERROR in enter_exit: $@"; 2000 warn "ERROR in enter_exit: $@";
1992 $self->leave_link; 2001 $self->leave_link;
1993 } 2002 }
1994 })->prio (1); 2003 })->prio (1);
… …
2323 while (my ($face, $info) = each %$faces) { 2332 while (my ($face, $info) = each %$faces) {
2324 next unless $info->{smooth}; 2333 next unless $info->{smooth};
2325 my $idx = cf::face::find $face 2334 my $idx = cf::face::find $face
2326 or next; 2335 or next;
2327 if (my $smooth = cf::face::find $info->{smooth}) { 2336 if (my $smooth = cf::face::find $info->{smooth}) {
2328 cf::face::set_smooth $idx, $smooth; 2337 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2329 } else { 2338 } else {
2330 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2339 warn "smooth face '$info->{smooth}' not found for face '$face'";
2331 } 2340 }
2332 Coro::cede; 2341 Coro::cede;
2333 } 2342 }

Diff Legend

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