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.422 by root, Tue Apr 15 20:46:55 2008 UTC vs.
Revision 1.428 by root, Thu May 1 06:33:19 2008 UTC

… …
427 } 427 }
428 } 428 }
429}; 429};
430 430
431sub get_slot($;$$) { 431sub get_slot($;$$) {
432 return if tick_inhibit; 432 return if tick_inhibit || $Coro::current == $Coro::main;
433 433
434 my ($time, $pri, $name) = @_; 434 my ($time, $pri, $name) = @_;
435 435
436 $time = $TICK * .6 if $time > $TICK * .6; 436 $time = $TICK * .6 if $time > $TICK * .6;
437 my $sig = new Coro::Signal; 437 my $sig = new Coro::Signal;
… …
1141 utf8::decode (my $decname = $filename); 1141 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1142 warn sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1143 $decname, length $$rdata, scalar @$objs;
1144 1144
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1146 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1148 aio_fsync $fh if $cf::USE_FSYNC;
1149 close $fh; 1149 aio_close $fh;
1150 1150
1151 if (@$objs) { 1151 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1155 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1157 close $fh; 1157 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1158 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1159 }
1160 } else { 1160 } else {
1161 aio_unlink "$filename.pst"; 1161 aio_unlink "$filename.pst";
1162 } 1162 }
… …
1456 my $f = new_from_file cf::object::thawer path $login 1456 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1457 or return;
1458 1458
1459 my $pl = cf::player::load_pl $f 1459 my $pl = cf::player::load_pl $f
1460 or return; 1460 or return;
1461
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1462 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1463 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1464 $cf::PLAYER{$login} = $pl
1464 } 1465 }
1465 } 1466 }
… …
1570 1571
1571 for my $login (@$dirs) { 1572 for my $login (@$dirs) {
1572 my $path = path $login; 1573 my $path = path $login;
1573 1574
1574 # a .pst is a dead give-away for a valid player 1575 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1576 # if no pst file found, open and chekc for blocked users
1577 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1578 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1579 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1580 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1581 }
1580 1582
… …
2457can be C<undef>. Does the right thing when the player is currently in a 2459can be C<undef>. Does the right thing when the player is currently in a
2458dialogue with the given NPC character. 2460dialogue with the given NPC character.
2459 2461
2460=cut 2462=cut
2461 2463
2464our $SAY_CHANNEL = {
2465 id => "say",
2466 title => "Map",
2467 reply => "say ",
2468 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2469};
2470
2471our $CHAT_CHANNEL = {
2472 id => "chat",
2473 title => "Chat",
2474 reply => "chat ",
2475 tooltip => "Player chat and shouts, global to the server.",
2476};
2477
2462# rough implementation of a future "reply" method that works 2478# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2479# with dialog boxes.
2464#TODO: the first argument must go, split into a $npc->reply_to ( method 2480#TODO: the first argument must go, split into a $npc->reply_to ( method
2465sub cf::object::player::reply($$$;$) { 2481sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2482 my ($self, $npc, $msg, $flags) = @_;
… …
2477 my $dialog = $pl->{npc_dialog}; 2493 my $dialog = $pl->{npc_dialog};
2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2494 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479 2495
2480 } else { 2496 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2497 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2498 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2499 }
2484 } 2500 }
2485} 2501}
2486 2502
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2503=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2832 id => "infobox", 2848 id => "infobox",
2833 title => "Map Info", 2849 title => "Map Info",
2834 reply => undef, 2850 reply => undef,
2835 tooltip => "Information related to the maps", 2851 tooltip => "Information related to the maps",
2836 }, 2852 },
2853 "c/party" => {
2854 id => "party",
2855 title => "Party",
2856 reply => "gsay ",
2857 tooltip => "Messages and chat related to your party",
2858 },
2837); 2859);
2838 2860
2839sub cf::client::send_msg { 2861sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 2862 my ($self, $channel, $msg, $color, @extra) = @_;
2841 2863
… …
3078 3100
3079The following functions and methods are available within a safe environment: 3101The following functions and methods are available within a safe environment:
3080 3102
3081 cf::object 3103 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3104 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr 3105 insert remove name archname title slaying race decrease split
3084 3106
3085 cf::object::player 3107 cf::object::player
3086 player 3108 player
3087 3109
3088 cf::player 3110 cf::player
… …
3094=cut 3116=cut
3095 3117
3096for ( 3118for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3119 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3120 insert remove inv name archname title slaying race
3099 decrease_ob_nr destroy)], 3121 decrease split destroy)],
3100 ["cf::object::player" => qw(player)], 3122 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3123 ["cf::player" => qw(peaceful)],
3102 ["cf::map" => qw(trigger)], 3124 ["cf::map" => qw(trigger)],
3103) { 3125) {
3104 no strict 'refs'; 3126 no strict 'refs';
… …
3312 while (my ($k, $v) = each %$want) { 3334 while (my ($k, $v) = each %$want) {
3313 $ns->fx_want ($k, $v); 3335 $ns->fx_want ($k, $v);
3314 } 3336 }
3315}; 3337};
3316 3338
3339sub load_resource_file($) {
3340 my $guard = lock_acquire "load_resource_file";
3341
3342 my $status = load_resource_file_ $_[0];
3343 get_slot 0.1, 100;
3344 cf::arch::commit_load;
3345
3346 $status
3347}
3348
3317sub reload_regions { 3349sub reload_regions {
3318 # HACK to clear player env face cache, we need some signal framework 3350 # HACK to clear player env face cache, we need some signal framework
3319 # for this (global event?) 3351 # for this (global event?)
3320 %ext::player_env::MUSIC_FACE_CACHE = (); 3352 %ext::player_env::MUSIC_FACE_CACHE = ();
3321 3353
… …
3334} 3366}
3335 3367
3336sub reload_archetypes { 3368sub reload_archetypes {
3337 load_resource_file "$DATADIR/archetypes" 3369 load_resource_file "$DATADIR/archetypes"
3338 or die "unable to load archetypes\n"; 3370 or die "unable to load archetypes\n";
3339 #d# NEED to laod twice to resolve forward references
3340 # this really needs to be done in an extra post-pass
3341 # (which needs to be synchronous, so solve it differently)
3342 load_resource_file "$DATADIR/archetypes"
3343 or die "unable to load archetypes\n";
3344} 3371}
3345 3372
3346sub reload_treasures { 3373sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3374 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3375 or die "unable to load treasurelists\n";
3349} 3376}
3350 3377
3351sub reload_resources { 3378sub reload_resources {
3352 warn "reloading resource files...\n"; 3379 warn "reloading resource files...\n";
3353 3380
3381 reload_facedata;
3382 reload_archetypes;
3354 reload_regions; 3383 reload_regions;
3355 reload_facedata;
3356 #reload_archetypes;#d#
3357 reload_archetypes;
3358 reload_treasures; 3384 reload_treasures;
3359 3385
3360 warn "finished reloading resource files\n"; 3386 warn "finished reloading resource files\n";
3361} 3387}
3362 3388
3363sub init { 3389sub init {
3390 my $guard = freeze_mainloop;
3391
3364 reload_resources; 3392 reload_resources;
3365} 3393}
3366 3394
3367sub reload_config { 3395sub reload_config {
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3396 open my $fh, "<:utf8", "$CONFDIR/config"
… …
3393 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3421 $Coro::current->{desc} = "IDLE BUG HANDLER";
3394 EV::loop EV::LOOP_ONESHOT; 3422 EV::loop EV::LOOP_ONESHOT;
3395 })->prio (Coro::PRIO_MAX); 3423 })->prio (Coro::PRIO_MAX);
3396 }; 3424 };
3397 3425
3426 {
3427 my $guard = freeze_mainloop;
3398 reload_config; 3428 reload_config;
3399 db_init; 3429 db_init;
3400 load_extensions; 3430 load_extensions;
3401 3431
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 evthread_start IO::AIO::poll_fileno; 3433 evthread_start IO::AIO::poll_fileno;
3434 }
3435
3404 EV::loop; 3436 EV::loop;
3405} 3437}
3406 3438
3407############################################################################# 3439#############################################################################
3408# initialisation and cleanup 3440# initialisation and cleanup
… …
3690 3722
3691our @WAIT_FOR_TICK; 3723our @WAIT_FOR_TICK;
3692our @WAIT_FOR_TICK_BEGIN; 3724our @WAIT_FOR_TICK_BEGIN;
3693 3725
3694sub wait_for_tick { 3726sub wait_for_tick {
3695 return if tick_inhibit;
3696 return if $Coro::current == $Coro::main; 3727 return if tick_inhibit || $Coro::current == $Coro::main;
3697 3728
3698 my $signal = new Coro::Signal; 3729 my $signal = new Coro::Signal;
3699 push @WAIT_FOR_TICK, $signal; 3730 push @WAIT_FOR_TICK, $signal;
3700 $signal->wait; 3731 $signal->wait;
3701} 3732}
3702 3733
3703sub wait_for_tick_begin { 3734sub wait_for_tick_begin {
3704 return if tick_inhibit;
3705 return if $Coro::current == $Coro::main; 3735 return if tick_inhibit || $Coro::current == $Coro::main;
3706 3736
3707 my $signal = new Coro::Signal; 3737 my $signal = new Coro::Signal;
3708 push @WAIT_FOR_TICK_BEGIN, $signal; 3738 push @WAIT_FOR_TICK_BEGIN, $signal;
3709 $signal->wait; 3739 $signal->wait;
3710} 3740}

Diff Legend

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