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.345 by root, Tue Aug 28 19:30:11 2007 UTC vs.
Revision 1.354 by root, Sun Sep 2 12:26:54 2007 UTC

… …
272Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
275returned. 275returned.
276 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
277Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
279 282
280=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
281 284
… …
575 if (1) { 578 if (1) {
576 $md5 = 579 $md5 =
577 join "\x00", 580 join "\x00",
578 $processversion, 581 $processversion,
579 map { 582 map {
580 Coro::cede; 583 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 585 } 0.. $#$src;
583 586
584 587
585 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
1322 1325
1323 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1325 1328
1326 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1327 Coro::cede; 1330 cf::cede_to_tick;
1328} 1331}
1329 1332
1330sub new($) { 1333sub new($) {
1331 my ($login) = @_; 1334 my ($login) = @_;
1332 1335
… …
1410 or return []; 1413 or return [];
1411 1414
1412 my @logins; 1415 my @logins;
1413 1416
1414 for my $login (@$dirs) { 1417 for my $login (@$dirs) {
1418 my $path = path $login;
1419
1420 # a .pst is a dead give-away for a valid player
1421 unless (-e "$path.pst") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1422 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1423 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1424 $buf !~ /^password -------------$/m or next; # official not-valid tag
1425 }
1418 1426
1419 utf8::decode $login; 1427 utf8::decode $login;
1420 push @logins, $login; 1428 push @logins, $login;
1421 } 1429 }
1422 1430
… …
1460sub expand_cfpod { 1468sub expand_cfpod {
1461 ((my $self), (local $_)) = @_; 1469 ((my $self), (local $_)) = @_;
1462 1470
1463 # escape & and < 1471 # escape & and <
1464 s/&/&amp;/g; 1472 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g; 1473 s/(?<![BIUGHT])</&lt;/g;
1466 1474
1467 # this is buggy, it needs to properly take care of nested <'s 1475 # this is buggy, it needs to properly take care of nested <'s
1468 1476
1469 1 while 1477 1 while
1470 # replace B<>, I<>, U<> etc. 1478 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/ 1479 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/ 1480 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/ 1481 || s/U<([^\>]*)>/<u>$1<\/u>/
1482 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1474 # replace G<male|female> tags 1483 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{ 1484 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1 1485 $self->gender ? $2 : $1
1477 }ge 1486 }ge
1478 # replace H<hint text> 1487 # replace H<hint text>
… …
1859 $self->in_memory (cf::MAP_LOADING); 1868 $self->in_memory (cf::MAP_LOADING);
1860 1869
1861 $self->alloc; 1870 $self->alloc;
1862 1871
1863 $self->pre_load; 1872 $self->pre_load;
1864 Coro::cede; 1873 cf::cede_to_tick;
1865 1874
1866 $self->_load_objects ($self->{load_path}, 1) 1875 $self->_load_objects ($self->{load_path}, 1)
1867 or return; 1876 or return;
1868 1877
1869 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1878 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1875 $self->clear_unique_items; 1884 $self->clear_unique_items;
1876 $self->_load_objects ($uniq, 0); 1885 $self->_load_objects ($uniq, 0);
1877 } 1886 }
1878 } 1887 }
1879 1888
1880 Coro::cede; 1889 cf::cede_to_tick;
1881 # now do the right thing for maps 1890 # now do the right thing for maps
1882 $self->link_multipart_objects; 1891 $self->link_multipart_objects;
1883 $self->difficulty ($self->estimate_difficulty) 1892 $self->difficulty ($self->estimate_difficulty)
1884 unless $self->difficulty; 1893 unless $self->difficulty;
1885 Coro::cede; 1894 cf::cede_to_tick;
1886 1895
1887 unless ($self->{deny_activate}) { 1896 unless ($self->{deny_activate}) {
1888 $self->decay_objects; 1897 $self->decay_objects;
1889 $self->fix_auto_apply; 1898 $self->fix_auto_apply;
1890 $self->update_buttons; 1899 $self->update_buttons;
1891 Coro::cede; 1900 cf::cede_to_tick;
1892 $self->set_darkness_map; 1901 $self->set_darkness_map;
1893 Coro::cede; 1902 cf::cede_to_tick;
1894 $self->activate; 1903 $self->activate;
1895 } 1904 }
1896 1905
1897 $self->{last_save} = $cf::RUNTIME; 1906 $self->{last_save} = $cf::RUNTIME;
1898 $self->last_access ($cf::RUNTIME); 1907 $self->last_access ($cf::RUNTIME);
… …
2083my $nuke_counter = "aaaa"; 2092my $nuke_counter = "aaaa";
2084 2093
2085sub nuke { 2094sub nuke {
2086 my ($self) = @_; 2095 my ($self) = @_;
2087 2096
2097 {
2098 my $lock = cf::lock_acquire "map_data:$self->{path}";
2099
2088 delete $cf::MAP{$self->path}; 2100 delete $cf::MAP{$self->path};
2089 2101
2090 $self->unlink_save; 2102 $self->unlink_save;
2091 2103
2092 bless $self, "cf::map"; 2104 bless $self, "cf::map";
2093 delete $self->{deny_reset}; 2105 delete $self->{deny_reset};
2094 $self->{deny_save} = 1; 2106 $self->{deny_save} = 1;
2095 $self->reset_timeout (1); 2107 $self->reset_timeout (1);
2096 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2108 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2097 2109
2098 $cf::MAP{$self->path} = $self; 2110 $cf::MAP{$self->path} = $self;
2111 }
2099 2112
2100 $self->reset; # polite request, might not happen 2113 $self->reset; # polite request, might not happen
2101} 2114}
2102 2115
2103=item $maps = cf::map::tmp_maps 2116=item $maps = cf::map::tmp_maps
… …
2497the message, with C<log> being the default. If C<$color> is negative, suppress 2510the message, with C<log> being the default. If C<$color> is negative, suppress
2498the message unless the client supports the msg packet. 2511the message unless the client supports the msg packet.
2499 2512
2500=cut 2513=cut
2501 2514
2515our %CHANNEL = (
2516 "c/identify" => {
2517 id => "identify",
2518 title => "Identify",
2519 reply => undef,
2520 tooltip => "Items recently identified",
2521 },
2522 "c/examine" => {
2523 id => "examine",
2524 title => "Examine",
2525 reply => undef,
2526 tooltip => "Signs and other items you examined",
2527 },
2528);
2529
2502sub cf::client::send_msg { 2530sub cf::client::send_msg {
2503 my ($self, $channel, $msg, $color, @extra) = @_; 2531 my ($self, $channel, $msg, $color, @extra) = @_;
2504 2532
2505 $msg = $self->pl->expand_cfpod ($msg); 2533 $msg = $self->pl->expand_cfpod ($msg);
2506 2534
2507 $color &= cf::NDI_CLIENT_MASK; # just in case... 2535 $color &= cf::NDI_CLIENT_MASK; # just in case...
2536
2537 # check predefined channels, for the benefit of C
2538 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2508 2539
2509 if (ref $channel) { 2540 if (ref $channel) {
2510 # send meta info to client, if not yet sent 2541 # send meta info to client, if not yet sent
2511 unless (exists $self->{channel}{$channel->{id}}) { 2542 unless (exists $self->{channel}{$channel->{id}}) {
2512 $self->{channel}{$channel->{id}} = $channel; 2543 $self->{channel}{$channel->{id}} = $channel;
2513 $self->ext_msg (channel_info => $channel); 2544 $self->ext_msg (channel_info => $channel)
2545 if $self->can_msg;
2514 } 2546 }
2515 2547
2516 $channel = $channel->{id}; 2548 $channel = $channel->{id};
2517 } 2549 }
2518 2550
… …
2833# the server's init and main functions 2865# the server's init and main functions
2834 2866
2835sub load_facedata($) { 2867sub load_facedata($) {
2836 my ($path) = @_; 2868 my ($path) = @_;
2837 2869
2870 # HACK to clear player env face cache, we need some signal framework
2871 # for this (global event?)
2872 %ext::player_env::MUSIC_FACE_CACHE = ();
2873
2838 my $enc = JSON::XS->new->utf8->canonical->relaxed; 2874 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2839 2875
2840 warn "loading facedata from $path\n"; 2876 warn "loading facedata from $path\n";
2841 2877
2842 my $facedata; 2878 my $facedata;
… …
2953 $ns->fx_want ($k, $v); 2989 $ns->fx_want ($k, $v);
2954 } 2990 }
2955}; 2991};
2956 2992
2957sub reload_regions { 2993sub reload_regions {
2994 # HACK to clear player env face cache, we need some signal framework
2995 # for this (global event?)
2996 %ext::player_env::MUSIC_FACE_CACHE = ();
2997
2958 load_resource_file "$MAPDIR/regions" 2998 load_resource_file "$MAPDIR/regions"
2959 or die "unable to load regions file\n"; 2999 or die "unable to load regions file\n";
2960 3000
2961 for (cf::region::list) { 3001 for (cf::region::list) {
2962 $_->{match} = qr/$_->{match}/ 3002 $_->{match} = qr/$_->{match}/

Diff Legend

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