… | |
… | |
963 | } |
963 | } |
964 | |
964 | |
965 | sub path($) { |
965 | sub 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 | |
971 | sub find_active($) { |
971 | sub 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 | } |
… | |
… | |
2300 | sub load_facedata { |
2307 | sub load_facedata { |
2301 | my $path = sprintf "%s/facedata", cf::datadir; |
2308 | my $path = sprintf "%s/facedata", cf::datadir; |
2302 | |
2309 | |
2303 | warn "loading facedata from $path\n"; |
2310 | warn "loading facedata from $path\n"; |
2304 | |
2311 | |
2305 | my $faces; |
2312 | my $facedata; |
2306 | 0 < aio_load $path, $faces |
2313 | 0 < aio_load $path, $facedata |
2307 | or die "$path: $!"; |
2314 | or die "$path: $!"; |
2308 | |
2315 | |
2309 | Coro::cede; |
2316 | Coro::cede; |
2310 | $faces = Storable::thaw $faces; |
2317 | $facedata = Storable::thaw $facedata; |
2311 | Coro::cede; |
2318 | Coro::cede; |
2312 | |
2319 | |
2313 | my $meta = delete $faces->{""}; |
|
|
2314 | $meta->{version} == 1 |
2320 | $facedata->{version} == 2 |
2315 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
2321 | or cf::cleanup "$path: version mismatch, cannot proceed."; |
2316 | |
2322 | |
|
|
2323 | { |
|
|
2324 | my $faces = $facedata->{faceinfo}; |
|
|
2325 | |
2317 | while (my ($face, $info) = each %$faces) { |
2326 | while (my ($face, $info) = each %$faces) { |
2318 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
2327 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
2319 | cf::face::set $idx, $info->{visibility}, $info->{magicmap}; |
2328 | cf::face::set $idx, $info->{visibility}, $info->{magicmap}; |
2320 | cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; |
2329 | cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; |
2321 | cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; |
2330 | cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; |
2322 | Coro::cede; |
2331 | Coro::cede; |
2323 | } |
2332 | } |
2324 | |
2333 | |
2325 | while (my ($face, $info) = each %$faces) { |
2334 | while (my ($face, $info) = each %$faces) { |
2326 | next unless $info->{smooth}; |
2335 | next unless $info->{smooth}; |
2327 | my $idx = cf::face::find $face |
2336 | my $idx = cf::face::find $face |
2328 | or next; |
2337 | or next; |
2329 | if (my $smooth = cf::face::find $info->{smooth}) { |
2338 | if (my $smooth = cf::face::find $info->{smooth}) { |
2330 | cf::face::set_smooth $idx, $smooth; |
2339 | cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; |
2331 | } else { |
2340 | } else { |
2332 | warn "smooth face '$info->{smooth}' not found for face '$face'"; |
2341 | warn "smooth face '$info->{smooth}' not found for face '$face'"; |
2333 | } |
2342 | } |
2334 | 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 |
2335 | } |
2356 | } |
2336 | |
2357 | |
2337 | 1 |
2358 | 1 |
2338 | } |
2359 | } |
2339 | |
2360 | |