--- deliantra/server/ext/login.ext 2007/01/09 21:32:42 1.24 +++ deliantra/server/ext/login.ext 2007/02/17 23:54:35 1.31 @@ -1,4 +1,4 @@ -#! perl +#! perl # MANDATORY # login handling @@ -57,7 +57,13 @@ sub check_clean_save { my ($pl) = @_; - unless (delete $pl->{clean_save}) { + if (my $time = delete $pl->{unclean_save}) { + $pl->ns->send_drawinfo ( + "You didn't use a savebed to leave this realm. This is very dangerous, " + . "as lots of things could happen when you leave by other means, such as cave-ins, " + . "or monsters suddenly snapping your body. Better use a savebed next time.", + cf::NDI_RED + ); #d#TODO } } @@ -101,7 +107,7 @@ . "Chose another, or wait till the other session has ended.", cf::NDI_RED ); - } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}$/) { + } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) { last; } else { $ns->send_drawinfo ( @@ -158,7 +164,6 @@ my $pl = cf::player::find $user or next; $pl->connect ($ns); check_clean_save $pl; - $pl->{clean_save} = 1; last; } elsif (can_cleanup $pl, $mtime) { Coro::Timer::sleep 1; @@ -280,7 +285,7 @@ "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED); $pl->ns->flush; - $pl->quit_character; + cf::async { $pl->quit_character }; } }); }; @@ -330,7 +335,7 @@ $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; } else { $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; - delete $pl->{clean_save}; + $pl->{unclean_save} = $cf::RUNTIME; } }, ); @@ -345,8 +350,9 @@ our $SAVE_TIMEOUT = 20; # save players every n seconds our $SCHEDULER = cf::async_ext { + my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL); while () { - Coro::Timer::sleep $SCHEDULE_INTERVAL; + $schedule_interval->next; # this weird form of iteration over values is used because # the hash changes underneath us frequently, and for