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.231 by root, Wed Apr 4 00:02:06 2007 UTC vs.
Revision 1.236 by root, Thu Apr 12 14:18:05 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 }
… …
1147=cut 1154=cut
1148 1155
1149sub ext_event($$%) { 1156sub ext_event($$%) {
1150 my ($self, $type, %msg) = @_; 1157 my ($self, $type, %msg) = @_;
1151 1158
1152 delete $msg{msgid}; 1159 $self->ns->ext_event ($type, %msg);
1153 $msg{msgtype} = "event";
1154 $msg{eventtype} = $type;
1155
1156 $self->send ("ext " . cf::to_json \%msg);
1157} 1160}
1158 1161
1159package cf; 1162package cf;
1160 1163
1161=back 1164=back
… …
1969 1972
1970 return unless $self->type == cf::PLAYER; 1973 return unless $self->type == cf::PLAYER;
1971 1974
1972 if ($exit->slaying eq "/!") { 1975 if ($exit->slaying eq "/!") {
1973 #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
1974 cf::sync_job { prepare_random_map $exit }; 1979 cf::sync_job { prepare_random_map $exit };
1975 } 1980 }
1976 1981
1977 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;
1978 my $hp = $exit->stats->hp; 1983 my $hp = $exit->stats->hp;
… …
1986 $self->goto ($slaying, $hp, $sp); 1991 $self->goto ($slaying, $hp, $sp);
1987 1992
1988 1; 1993 1;
1989 }) { 1994 }) {
1990 $self->message ("Something went wrong deep within the crossfire server. " 1995 $self->message ("Something went wrong deep within the crossfire server. "
1991 . "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. "
1992 . "Please report this to the dungeon master!", 1997 . "Please report this to the dungeon master!",
1993 cf::NDI_UNIQUE | cf::NDI_RED); 1998 cf::NDI_UNIQUE | cf::NDI_RED);
1994 1999
1995 warn "ERROR in enter_exit: $@"; 2000 warn "ERROR in enter_exit: $@";
1996 $self->leave_link; 2001 $self->leave_link;
1997 } 2002 }
1998 })->prio (1); 2003 })->prio (1);
… …
2014 2019
2015 utf8::encode $text; 2020 utf8::encode $text;
2016 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2021 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2017} 2022}
2018 2023
2024=item $client->ext_event ($type, %msg)
2025
2026Sends an exti event to the client.
2027
2028=cut
2029
2030sub cf::client::ext_event($$%) {
2031 my ($self, $type, %msg) = @_;
2032
2033 $msg{msgtype} = "event_$type";
2034 $self->send_packet ("ext " . cf::to_json \%msg);
2035}
2019 2036
2020=item $success = $client->query ($flags, "text", \&cb) 2037=item $success = $client->query ($flags, "text", \&cb)
2021 2038
2022Queues a query to the client, calling the given callback with 2039Queues a query to the client, calling the given callback with
2023the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2040the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
… …
2290sub load_facedata { 2307sub load_facedata {
2291 my $path = sprintf "%s/facedata", cf::datadir; 2308 my $path = sprintf "%s/facedata", cf::datadir;
2292 2309
2293 warn "loading facedata from $path\n"; 2310 warn "loading facedata from $path\n";
2294 2311
2295 my $faces; 2312 my $facedata;
2296 0 < aio_load $path, $faces 2313 0 < aio_load $path, $facedata
2297 or die "$path: $!"; 2314 or die "$path: $!";
2298 2315
2299 Coro::cede; 2316 Coro::cede;
2300 $faces = Storable::thaw $faces; 2317 $facedata = Storable::thaw $facedata;
2301 Coro::cede; 2318 Coro::cede;
2302 2319
2303 my $meta = delete $faces->{""};
2304 $meta->{version} == 1 2320 $facedata->{version} == 2
2305 or cf::cleanup "$path: version mismatch, cannot proceed."; 2321 or cf::cleanup "$path: version mismatch, cannot proceed.";
2306 2322
2323 {
2324 my $faces = $facedata->{faceinfo};
2325
2307 while (my ($face, $info) = each %$faces) { 2326 while (my ($face, $info) = each %$faces) {
2308 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2327 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2309 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2328 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2310 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2329 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2311 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2330 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2312 Coro::cede; 2331 Coro::cede;
2313 } 2332 }
2314 2333
2315 while (my ($face, $info) = each %$faces) { 2334 while (my ($face, $info) = each %$faces) {
2316 next unless $info->{smooth}; 2335 next unless $info->{smooth};
2317 my $idx = cf::face::find $face 2336 my $idx = cf::face::find $face
2318 or next; 2337 or next;
2319 if (my $smooth = cf::face::find $info->{smooth}) { 2338 if (my $smooth = cf::face::find $info->{smooth}) {
2320 cf::face::set_smooth $idx, $smooth; 2339 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2321 } else { 2340 } else {
2322 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2341 warn "smooth face '$info->{smooth}' not found for face '$face'";
2323 } 2342 }
2324 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
2325 } 2356 }
2326 2357
2327 1 2358 1
2328} 2359}
2329 2360

Diff Legend

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