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.238 by root, Sat Apr 14 07:23:00 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 }
… …
1150 my ($self, $type, %msg) = @_; 1159 my ($self, $type, %msg) = @_;
1151 1160
1152 $self->ns->ext_event ($type, %msg); 1161 $self->ns->ext_event ($type, %msg);
1153} 1162}
1154 1163
1155package cf; 1164=head3 cf::region
1165
1166=over 4
1167
1168=cut
1169
1170package cf::region;
1171
1172=item cf::region::find_by_path $path
1173
1174Tries to decuce the probable region for a map knowing only its path.
1175
1176=cut
1177
1178sub find_by_path($) {
1179 my ($path) = @_;
1180
1181 my ($match, $specificity);
1182
1183 for my $region (list) {
1184 if ($region->match && $path =~ $region->match) {
1185 ($match, $specificity) = ($region, $region->specificity)
1186 if $region->specificity > $specificity;
1187 }
1188 }
1189
1190 $match
1191}
1156 1192
1157=back 1193=back
1158
1159 1194
1160=head3 cf::map 1195=head3 cf::map
1161 1196
1162=over 4 1197=over 4
1163 1198
… …
1394 $self->load_header_orig 1429 $self->load_header_orig
1395 or return; 1430 or return;
1396 $self->prepare_orig; 1431 $self->prepare_orig;
1397 } 1432 }
1398 1433
1434 $self->default_region (cf::region::find_by_path $self->{path})
1435 unless $self->default_region;
1436
1399 1 1437 1
1400} 1438}
1401 1439
1402sub find; 1440sub find;
1403sub find { 1441sub find {
… …
1965 2003
1966 return unless $self->type == cf::PLAYER; 2004 return unless $self->type == cf::PLAYER;
1967 2005
1968 if ($exit->slaying eq "/!") { 2006 if ($exit->slaying eq "/!") {
1969 #TODO: this should de-fi-ni-te-ly not be a sync-job 2007 #TODO: this should de-fi-ni-te-ly not be a sync-job
2008 # the problem is that $exit might not survive long enough
2009 # so it needs to be done right now, right here
1970 cf::sync_job { prepare_random_map $exit }; 2010 cf::sync_job { prepare_random_map $exit };
1971 } 2011 }
1972 2012
1973 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2013 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1974 my $hp = $exit->stats->hp; 2014 my $hp = $exit->stats->hp;
… …
1982 $self->goto ($slaying, $hp, $sp); 2022 $self->goto ($slaying, $hp, $sp);
1983 2023
1984 1; 2024 1;
1985 }) { 2025 }) {
1986 $self->message ("Something went wrong deep within the crossfire server. " 2026 $self->message ("Something went wrong deep within the crossfire server. "
1987 . "I'll try to bring you back to the map you were before. " 2027 . "I'll try to bring you back to the map you were before. "
1988 . "Please report this to the dungeon master!", 2028 . "Please report this to the dungeon master!",
1989 cf::NDI_UNIQUE | cf::NDI_RED); 2029 cf::NDI_UNIQUE | cf::NDI_RED);
1990 2030
1991 warn "ERROR in enter_exit: $@"; 2031 warn "ERROR in enter_exit: $@";
1992 $self->leave_link; 2032 $self->leave_link;
1993 } 2033 }
1994 })->prio (1); 2034 })->prio (1);
… …
2298sub load_facedata { 2338sub load_facedata {
2299 my $path = sprintf "%s/facedata", cf::datadir; 2339 my $path = sprintf "%s/facedata", cf::datadir;
2300 2340
2301 warn "loading facedata from $path\n"; 2341 warn "loading facedata from $path\n";
2302 2342
2303 my $faces; 2343 my $facedata;
2304 0 < aio_load $path, $faces 2344 0 < aio_load $path, $facedata
2305 or die "$path: $!"; 2345 or die "$path: $!";
2306 2346
2307 Coro::cede;
2308 $faces = Storable::thaw $faces; 2347 $facedata = Coro::Storable::thaw $facedata;
2309 Coro::cede;
2310 2348
2311 my $meta = delete $faces->{""};
2312 $meta->{version} == 1 2349 $facedata->{version} == 2
2313 or cf::cleanup "$path: version mismatch, cannot proceed."; 2350 or cf::cleanup "$path: version mismatch, cannot proceed.";
2314 2351
2352 {
2353 my $faces = $facedata->{faceinfo};
2354
2315 while (my ($face, $info) = each %$faces) { 2355 while (my ($face, $info) = each %$faces) {
2316 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2356 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2317 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2357 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2318 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2358 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2319 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2359 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2320 Coro::cede; 2360 Coro::cede;
2321 } 2361 }
2322 2362
2323 while (my ($face, $info) = each %$faces) { 2363 while (my ($face, $info) = each %$faces) {
2324 next unless $info->{smooth}; 2364 next unless $info->{smooth};
2325 my $idx = cf::face::find $face 2365 my $idx = cf::face::find $face
2326 or next; 2366 or next;
2327 if (my $smooth = cf::face::find $info->{smooth}) { 2367 if (my $smooth = cf::face::find $info->{smooth}) {
2328 cf::face::set_smooth $idx, $smooth; 2368 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2329 } else { 2369 } else {
2330 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2370 warn "smooth face '$info->{smooth}' not found for face '$face'";
2331 } 2371 }
2332 Coro::cede; 2372 Coro::cede;
2373 }
2374 }
2375
2376 {
2377 my $anims = $facedata->{animinfo};
2378
2379 while (my ($anim, $info) = each %$anims) {
2380 cf::anim::set $anim, $info->{frames}, $info->{facings};
2381 Coro::cede;
2382 }
2383
2384 cf::anim::invalidate_all; # d'oh
2333 } 2385 }
2334 2386
2335 1 2387 1
2336} 2388}
2337 2389

Diff Legend

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