--- deliantra/server/ext/login.ext 2007/02/11 17:47:22 1.30 +++ deliantra/server/ext/login.ext 2007/04/04 02:20:27 1.36 @@ -4,6 +4,7 @@ use Fcntl; use Coro::AIO; +use List::Util qw(min max); my $PLAYERDIR = sprintf "%s/%s", cf::localdir, cf::playerdir; @@ -79,10 +80,167 @@ . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)"; } +sub send_capabilities { + my ($ns) = @_; + + return unless $ns->extcmd; + + $ns->ext_event (capabilities => + # id, name, flags (1 == 2d), edge length + tileset => [[1, "default 64x64 faceset", 1, 64], [0, "default 32x32 faceset", 1, 32]], + ); +} + +sub setup { + my ($ns, $args) = @_; + + # run through the cmds of setup + # syntax is setup ... + # + # we send the status of the cmd back, or a FALSE is the cmd is the server unknown + # The client then must sort this out + + my %setup = split / +/, $args; + while (my ($k, $v) = each %setup) { + if ($k eq "sound") { + $ns->sound ($v); + + } elsif ($k eq "exp64") { + $setup{$k} = 1; + + } elsif ($k eq "spellmon") { + $ns->monitor_spells ($v); + + } elsif ($k eq "darkness") { + $ns->darkness ($v); + + } elsif ($k eq "map1cmd") { + $ns->mapmode (cf::Map1Cmd) if $v > 0; + + } elsif ($k eq "map1acmd") { + $ns->mapmode (cf::Map1aCmd) if $v > 0; + + } elsif ($k eq "map2cmd") { + # gcfclient bug, map1acmd is sent too late + $ns->mapmode (cf::Map1aCmd); + $setup{$k} = "FALSE"; + + } elsif ($k eq "newmapcmd") { + $ns->newmapcmd ($v); + + } elsif ($k eq "mapinfocmd") { + $ns->mapinfocmd ($v); + + } elsif ($k eq "extcmd") { + $ns->extcmd ($v > 0); + send_capabilities $ns; + + } elsif ($k eq "extmap") { + $ns->extmap ($v); + + } elsif ($k eq "facecache") { + $ns->facecache ($v); + + } elsif ($k eq "faceset") { + $ns->faceset (0); + $setup{$k} = 0; + # $ns->image2 (1) + + } elsif ($k eq "tileset") { + $setup{$k} = $ns->faceset ($v & 1); + + } elsif ($k eq "itemcmd") { + # Version of the item protocol command to use. Currently, + # only supported versions are 1 and 2. Using a numeric + # value will make it very easy to extend this in the future. + $ns->itemcmd ($v) if $v >= 1 && $v <= 2; + + $setup{$k} = $ns->itemcmd; + + } elsif ($k eq "mapsize") { + my ($x, $y) = split /x/, $v; + + $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, ($x - 1) | 1); + $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, ($y - 1) | 1); + + $setup{$k} = "${x}x${y}"; + + } elsif ($k eq "extendedMapInfos") { + $ns->ext_mapinfos ($v); + + } elsif ($k eq "extendedTextInfos") { + $ns->has_readable_type ($v); + + } elsif ($k eq "fxix") { + $ns->fxix ($v); + + } else { + # other commands: + # sexp: no idea, probably for oudated servers + # tick: more stupidity, server should sned a tick per tick + + $setup{$k} = "FALSE"; + } + } + + $ns->send_packet (join " ", setup => %setup); + + cf::datalog setup => + request => $args, + reply => \%setup, + client => $ns->version, + ; +} + sub addme { my ($ns) = @_; - $ns->destroy if $ns->pl; + if (!$ns->facecache) + { + $ns->send_drawinfo (<Configure=>Map & Image=>Cache Images. +*** jcrossclient: your client is broken, use CFPlus 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 (<flush; + return $ns->destroy; + } + + $ns->pl and return $ns->destroy; $ns->async (sub { my ($user, $pass); @@ -285,7 +443,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 }; } }); }; @@ -342,6 +500,7 @@ cf::client->attach ( on_addme => \&addme, + on_setup => \&setup, ); #############################################################################