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

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.94 by root, Sat Dec 13 21:46:12 2008 UTC vs.
Revision 1.100 by root, Wed Sep 2 16:54:20 2009 UTC

 }
 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;
             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#
 }
 # 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;
 });
 cf::register_command quit => sub {
    my ($ob, $arg) = @_;
-   $ob->reply (undef,
+   $ob->send_msg (undef,
-               "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
+                  "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
-               . "If you are sure you want to do this, then use the quit_character command instead of quit.",
+                  . "If you are sure you want to do this, then use the quit_character command instead of quit.",
-               cf::NDI_UNIQUE | cf::NDI_RED);
+                  cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
 };
 cf::register_command quit_character => sub {
    my ($ob, $arg) = @_;
    my $pl = $ob->contr;
    $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
       if ($_[0] !~ /^[yY]/) {
-         $ob->reply (undef,
+         $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
-                     "Ok, not not quitting then.",
-                     cf::NDI_UNIQUE | cf::NDI_RED);
       } else {
-         $ob->reply (undef,
+         $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
-                     "Ok, quitting, hope to see you again.",
-                     cf::NDI_UNIQUE | cf::NDI_RED);
          $pl->ns->flush;
          cf::async { $pl->quit_character };
       }
    });
 };
       cf::async { $pl->save };
       my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
       $ob->check_score;
-      $ob->reply (undef, "In the future, you will wake up here when you die.");
+      $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]/) {
             $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
             $pl->deactivate;

Diff Legend

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

Comparing deliantra/server/ext/login.ext (file contents): Revision 1.94 by root, Sat Dec 13 21:46:12 2008 UTC vs. Revision 1.100 by root, Wed Sep 2 16:54:20 2009 UTC

Diff Legend

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.94 by root, Sat Dec 13 21:46:12 2008 UTC vs.
Revision 1.100 by root, Wed Sep 2 16:54:20 2009 UTC