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.230 by root, Mon Apr 2 18:04:46 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 }
… …
1124 } 1133 }
1125 1134
1126 \@paths 1135 \@paths
1127} 1136}
1128 1137
1129=item $player->ext_reply ($msgid, $msgtype, %msg) 1138=item $player->ext_reply ($msgid, %msg)
1130 1139
1131Sends an ext reply to the player. 1140Sends an ext reply to the player.
1132 1141
1133=cut 1142=cut
1134 1143
1135sub ext_reply($$$%) { 1144sub ext_reply($$%) {
1136 my ($self, $id, %msg) = @_; 1145 my ($self, $id, %msg) = @_;
1137 1146
1138 $msg{msgid} = $id; 1147 $msg{msgid} = $id;
1139 1148
1140 $self->send ("ext " . cf::to_json \%msg); 1149 $self->send ("ext " . cf::to_json \%msg);
1150}
1151
1152=item $player->ext_event ($type, %msg)
1153
1154Sends an ext event to the client.
1155
1156=cut
1157
1158sub ext_event($$%) {
1159 my ($self, $type, %msg) = @_;
1160
1161 $self->ns->ext_event ($type, %msg);
1141} 1162}
1142 1163
1143package cf; 1164package cf;
1144 1165
1145=back 1166=back
… …
1953 1974
1954 return unless $self->type == cf::PLAYER; 1975 return unless $self->type == cf::PLAYER;
1955 1976
1956 if ($exit->slaying eq "/!") { 1977 if ($exit->slaying eq "/!") {
1957 #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
1958 cf::sync_job { prepare_random_map $exit }; 1981 cf::sync_job { prepare_random_map $exit };
1959 } 1982 }
1960 1983
1961 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;
1962 my $hp = $exit->stats->hp; 1985 my $hp = $exit->stats->hp;
… …
1970 $self->goto ($slaying, $hp, $sp); 1993 $self->goto ($slaying, $hp, $sp);
1971 1994
1972 1; 1995 1;
1973 }) { 1996 }) {
1974 $self->message ("Something went wrong deep within the crossfire server. " 1997 $self->message ("Something went wrong deep within the crossfire server. "
1975 . "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. "
1976 . "Please report this to the dungeon master!", 1999 . "Please report this to the dungeon master!",
1977 cf::NDI_UNIQUE | cf::NDI_RED); 2000 cf::NDI_UNIQUE | cf::NDI_RED);
1978 2001
1979 warn "ERROR in enter_exit: $@"; 2002 warn "ERROR in enter_exit: $@";
1980 $self->leave_link; 2003 $self->leave_link;
1981 } 2004 }
1982 })->prio (1); 2005 })->prio (1);
… …
1998 2021
1999 utf8::encode $text; 2022 utf8::encode $text;
2000 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2023 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2001} 2024}
2002 2025
2026=item $client->ext_event ($type, %msg)
2027
2028Sends an exti event to the client.
2029
2030=cut
2031
2032sub cf::client::ext_event($$%) {
2033 my ($self, $type, %msg) = @_;
2034
2035 $msg{msgtype} = "event_$type";
2036 $self->send_packet ("ext " . cf::to_json \%msg);
2037}
2003 2038
2004=item $success = $client->query ($flags, "text", \&cb) 2039=item $success = $client->query ($flags, "text", \&cb)
2005 2040
2006Queues a query to the client, calling the given callback with 2041Queues a query to the client, calling the given callback with
2007the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2042the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
… …
2274sub load_facedata { 2309sub load_facedata {
2275 my $path = sprintf "%s/facedata", cf::datadir; 2310 my $path = sprintf "%s/facedata", cf::datadir;
2276 2311
2277 warn "loading facedata from $path\n"; 2312 warn "loading facedata from $path\n";
2278 2313
2279 my $faces; 2314 my $facedata;
2280 0 < aio_load $path, $faces 2315 0 < aio_load $path, $facedata
2281 or die "$path: $!"; 2316 or die "$path: $!";
2282 2317
2283 Coro::cede;
2284 $faces = Storable::thaw $faces; 2318 $facedata = Coro::Storable::thaw $facedata;
2285 Coro::cede;
2286 2319
2287 my $meta = delete $faces->{""};
2288 $meta->{version} == 1 2320 $facedata->{version} == 2
2289 or cf::cleanup "$path: version mismatch, cannot proceed."; 2321 or cf::cleanup "$path: version mismatch, cannot proceed.";
2290 2322
2323 {
2324 my $faces = $facedata->{faceinfo};
2325
2291 while (my ($face, $info) = each %$faces) { 2326 while (my ($face, $info) = each %$faces) {
2292 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2327 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2293 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2328 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2294 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2329 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2295 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2330 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2296 Coro::cede; 2331 Coro::cede;
2297 } 2332 }
2298 2333
2299 while (my ($face, $info) = each %$faces) { 2334 while (my ($face, $info) = each %$faces) {
2300 next unless $info->{smooth}; 2335 next unless $info->{smooth};
2301 my $idx = cf::face::find $face 2336 my $idx = cf::face::find $face
2302 or next; 2337 or next;
2303 if (my $smooth = cf::face::find $info->{smooth}) { 2338 if (my $smooth = cf::face::find $info->{smooth}) {
2304 cf::face::set_smooth $idx, $smooth; 2339 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2305 } else { 2340 } else {
2306 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2341 warn "smooth face '$info->{smooth}' not found for face '$face'";
2307 } 2342 }
2308 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
2309 } 2356 }
2310 2357
2311 1 2358 1
2312} 2359}
2313 2360

Diff Legend

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