[ViewVC] Diff of: cvs/deliantra/server/ext/login.ext

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.95 by root, Wed Dec 17 16:43:38 2008 UTC vs.
Revision 1.109 by root, Tue May 4 21:45:42 2010 UTC

-#! perl # mandatory
+#! perl # mandatory depends=highscore
 # login handling
 use Fcntl;
 use Coro::AIO;
 }
 sub enter_map {
    my ($pl) = @_;
-   warn $pl->ob->name, ": enter map 1\n";#d#
    my $ob = $pl->ob;
    my ($map, $x, $y)
       = $ob->{_link_pos}
         ? @{delete $ob->{_link_pos}}
         : ($pl->maplevel, $ob->x, $ob->y);
-   warn $pl->ob->name, ": enter map 2\n";#d#
    $ob->enter_link;
-   warn $pl->ob->name, ": enter map 3\n";#d#
    my $m = cf::map::find $map;
    my $time = delete $pl->{unclean_save};
-   warn $pl->ob->name, ": enter map 4\n";#d#
    if ($time && $m) {
       if ($time < $m->{instantiate_time}) {
          # the map was reset in the meantime
          my $age = $cf::RUNTIME - $time;
-         warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
+         cf::info $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
          if ($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. "
             cf::NDI_RED
          );
       }
    }
-   warn $pl->ob->name, ": enter map 5\n";#d#
-   #$ob->goto ($map, $x, $y);
+   $ob->goto ($map, $x, $y);
-   $ob->goto ($map, $x, $y, sub {
+}
-      warn $pl->ob->name, ": enter map check\n";#d#
-      $_[0]
-   }, sub {
-      warn $pl->ob->name, ": enter map done\n";#d#
-   });
-   warn $pl->ob->name, ": enter map 6\n";#d#
+sub encode_password {
+   crypt $_[0],
+      join '',
+         ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64), (cf::rndm 64)]
 }
 # delete a player directory, be non-blocking AND synchronous...
-# (thats hard, so we crap out and fork).
+# (that's hard, so we crap out and fork).
 sub nuke_playerdir {
    my ($user) = @_;
    my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
    };
 }
 cf::client->attach (on_addme => sub {
    my ($ns) = @_;
-   if (!$ns->facecache)
-     {
-       $ns->send_drawinfo (<<EOF, cf::NDI_RED);
-***
-*** WARNING:
-*** Your client does not support face/image caching,
-*** or it has been disabled. Face caching is mandatory
-*** so please enable it or use a newer client.
-***
-*** Look at your client preferences:
-***
-*** deliantra: all known versions automatically enable the facecache.
-*** cfclient: use the -cache commandline option.
-*** cfclient: map will not redraw automatically (bug).
-*** gcfclient: use -cache commandline option, or enable
-*** gcfclient: Client => Configure => Map & Image => Cache Images.
-*** jcrossclient: your client is broken, use deliantra or gcfclient.
-***
-***
-EOF
-      if ($ns->version =~ /jcrossclient/) {
-         # let them, for now
-      } else {
-        $ns->flush;
-        return $ns->destroy;
-      }
-      # $ns->facecache = true;
-   }
-   if ($ns->mapmode < cf::Map1aCmd) {
-      $ns->send_drawinfo (<<EOF, cf::NDI_RED);
-***
-*** WARNING:
-*** Your client is too old. Please upgrade to a newer version.
-EOF
-      $ns->flush;
-      return $ns->destroy;
-   }
    $ns->pl and return $ns->destroy;
    $ns->async (sub {
       $Coro::current->{desc} = "addme init";
             if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
                nuke_str $pass;
                # password matches, wonderful
                my $pl = cf::player::find $user or next;
                $pl->connect ($ns);
-               $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
                enter_map $pl;
                last;
             } elsif (can_cleanup $pl, $mtime) {
                Coro::Timer::sleep 1;
          }
          nuke_str $pass2;
          my $pl = cf::player::new $user;
-         $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
+         $pl->password (encode_password $pass);
          nuke_str $pass;
          $pl->connect ($ns);
          my $ob = $pl->ob;
          $ob->goto ($pl->maplevel, $ob->x, $ob->y);
                          "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
             last if $res =~ /[dD]/;
             $pl->chargen_race_next;
-            Coro::Timer::sleep 0.2;
+            Coro::Timer::sleep 0.05;
          }
          # create the playerdir, if necessary, as chargen_race_done did it before
          # presumably because of unique maps
          aio_mkdir playerdir $pl, 0770;
                last;
             } elsif ($res =~ /^[mM]/) {
                $pl->gender (0);
                last;
             }
-            Coro::Timer::sleep 0.2;
+            Coro::Timer::sleep 0.05;
          }
          $ob->reply (undef, "Welcome to Deliantra!");
          # XXX: Workaround for delayed client ext protocol handshake
          delete $pl->{deny_save};
          last;
       }
+      if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
+         $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
+      }
    });
 });
+cf::register_command password => sub {
+   my ($pl, $arg) = @_;
+   my (@args) = split /\s+/, $arg;
+   my ($new_pw, $player);
+   if ($pl->flag (cf::FLAG_WIZ)) {
+      ($player, $new_pw) = @args;
+   } else {
+      $new_pw = $args[0];
+   }
+   if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
+      $pl->message (
+         "Usage: password <player> [<new password>]",
+         cf::NDI_UNIQUE | cf::NDI_REPLY);
+      return;
+   } elsif (!$pl->flag (cf::FLAG_WIZ) && $new_pw eq '') {
+      $pl->message (
+         "Usage: password <new password>",
+         cf::NDI_UNIQUE | cf::NDI_REPLY);
+      return;
+   }
+   if ($player ne '' && $pl->flag (cf::FLAG_WIZ)) {
+      unless ($new_pw ne '') {
+         $new_pw =
+            join '',
+               map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
+                  1..9;
+      }
+      cf::async {
+         my $plc = cf::player::find $player;
+         if ($plc) {
+            $plc->password (encode_password $new_pw);
+            $pl->message (
+               "Ok, changed password of '$player' to '$new_pw'!",
+               cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
+         } else {
+            $pl->message (
+               "Fail! Couldn't set password for '$player', "
+               . "he doesn't seem to exist!",
+               cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
+         }
+      };
+   } else {
+      my $change = delete $pl->{password_change};
+      if ($change && (time - $change->[0]) < 60) {
+         $pl->message (
+            "Ok, changed your password!",
+            cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
+         $pl->contr->password (encode_password $new_pw);
+      } else {
+         $pl->message (
+            "Ok, please confirm your new password by sending "
+            . "the command again within one minute!",
+            cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
+         $pl->{password_change} = [time, $new_pw];
+      }
+   }
+};
 cf::register_command quit => sub {
    my ($ob, $arg) = @_;
    $ob->send_msg (undef,
       if ($_[0] !~ /^[yY]/) {
          $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
       } else {
          $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
          $pl->ns->flush;
+         cf::async {
+            ext::highscore::check $pl->ob;
-         cf::async { $pl->quit_character };
+            $pl->quit_character;
+         };
       }
    });
 };
 cf::object->attach (
       # update respawn position
       $pl->savebed ($bed->map->path, $bed->x, $bed->y);
       cf::async { $pl->save };
       my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
-      $ob->check_score;
+      ext::highscore::check $ob;
       $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
       $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
          if ($_[0] !~ /^[yY]/) {
             unless safe_spot $pl;
       }
    },
 );

Diff Legend

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

Comparing deliantra/server/ext/login.ext (file contents): Revision 1.95 by root, Wed Dec 17 16:43:38 2008 UTC vs. Revision 1.109 by root, Tue May 4 21:45:42 2010 UTC

Diff Legend

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.95 by root, Wed Dec 17 16:43:38 2008 UTC vs.
Revision 1.109 by root, Tue May 4 21:45:42 2010 UTC