--- deliantra/server/ext/login.ext 2007/09/02 12:37:10 1.70 +++ deliantra/server/ext/login.ext 2007/12/28 19:40:22 1.76 @@ -54,6 +54,12 @@ 1 } +sub safe_spot($$$) { + my ($m, $x, $y) = @_; + + scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y) +} + sub enter_map { my ($pl) = @_; @@ -74,10 +80,11 @@ warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d# - # for now, just go back to savebed ($map, $x, $y) = $pl->savebed; - if ($age >= $MAX_DISCONNECT_TIME) { + if (safe_spot $m, $x, $y) { + # do nothing, this is simply ok without a special scary message + } elsif ($age >= $MAX_DISCONNECT_TIME) { $ob->message ( "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. " @@ -98,6 +105,8 @@ cf::NDI_RED ); } + } elsif (safe_spot $m, $x, $y) { + # do nothing, this is simply ok without a special scary message } else { $ob->message ( "You didn't use a bed to reality to leave this realm. This is very dangerous, " @@ -118,8 +127,12 @@ sub nuke_playerdir { my ($user) = @_; - aio_rename "$PLAYERDIR/$user", "$PLAYERDIR/~$Coro::current~deleting~"; - system "rm -rf \Q$PLAYERDIR/~$Coro::current~deleting~\E &"; + my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; + + cf::fork_call { + rename "$PLAYERDIR/$user", $temp; + system "rm", "-rf", $temp; + }; } cf::client->attach (on_addme => sub { @@ -173,6 +186,8 @@ $ns->pl and return $ns->destroy; $ns->async (sub { + $Coro::current->{desc} = "addme init"; + my ($user, $pass); $ns->send_packet ("addme_success"); @@ -210,6 +225,8 @@ check_playing $ns, $user and next; + $Coro::current->{desc} = "addme($user) pass"; + $ns->send_drawinfo ( "Welcome $user, please enter your password now. " . "New users should now choose a password. " @@ -242,6 +259,8 @@ check_playing $ns, $user and next; + $Coro::current->{desc} = "addme($user) check"; + # try to read the user file and check the password if (my $pl = cf::player::find $user) { aio_stat $pl->path and next; @@ -304,6 +323,7 @@ } # the rest of this function is character creation + $Coro::current->{desc} = "addme($user) chargen"; # just to make sure nothing is left over nuke_playerdir $user; @@ -387,7 +407,7 @@ Coro::Timer::sleep 0.2; } - $ob->reply (undef, "Welcome to Crossfire!"); + $ob->reply (undef, "Welcome to Deliantra!"); delete $pl->{deny_save}; @@ -481,10 +501,10 @@ our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds our $SCHEDULER = cf::async_ext { - my $schedule_interval = Coro::Event->timer (after => 1); + $Coro::current->{desc} = "player scheduler"; + while () { - $schedule_interval->interval ($SCHEDULE_INTERVAL); - $schedule_interval->next; + Coro::EV::timer_once $SCHEDULE_INTERVAL; # this weird form of iteration over values is used because # the hash changes underneath us frequently, and for