[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/deliantra

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.32 by root, Tue Mar 25 19:28:56 2008 UTC vs.
Revision 1.48 by root, Mon Jul 7 08:02:17 2008 UTC

 #!/opt/bin/perl
+{
+package Deliantra::Client; # work around CPAN breakage
+package App::Deliantra; # try to reserve namespace
+}
 if ($ENV{DELIANTRA_CORO_DEBUG}) {
    eval '
       use Coro;
       use Coro::EV;
 use List::Util qw(max min);
 use Deliantra;
 use Deliantra::Protocol::Constants;
+use AnyEvent::DNS;
 use Compress::LZF;
 use DC;
+BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } }
 use DC::OpenGL ();
 use DC::Protocol;
 use DC::DB;
 use DC::UI;
 use DC::UI::Canvas;
          # right: accept
          $table->add_at (4, 0, new DC::UI::Button
             text => "Accept",
             on_activate => sub {
                $conn->send ("reply n");
-               $STATS_PAGE->hide;
                destroy_query_dialog $conn;
                0
             },
          );
    $vbox->add (@dialog);
    $dialog->show;
 }
-sub start_game {
+sub dc_connect {
-   status "logging in...";
+   my ($host, $port) = @_;
-   $LOGIN_BUTTON->set_text ("Logout");
-   $SETUP_DIALOG->hide;
    my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
-   my ($host, $port) = split /:/, $PROFILE->{host};
-   $MAP = new DC::Map;
-   $CONN = eval {
+   $CONN =
       new DC::Protocol
          host => $host,
          port => $port || 13327,
          user => $PROFILE->{user},
          pass => $PROFILE->{password},
          query      => \&server_query,
          setup_req  => {
             smoothing => $CFG->{map_smoothing}*1,
          },
-   };
-   if ($CONN) {
+         on_connect => sub {
+            if ($_[0]) {
-      DC::lowdelay fileno $CONN->{fh};
+               DC::lowdelay fileno $CONN->{fh};
-      status "login successful";
+               status "login successful";
+            } else {
+               undef $CONN;
+               status "unable to connect: $!";
+               stop_game();
+            }
+         },
+   ;
+}
+sub start_game {
+   status "logging in...";
+   $LOGIN_BUTTON->set_text ("Logout");
+   $SETUP_DIALOG->hide;
+   my ($host, $port) = split /:/, $PROFILE->{host};
+   $MAP = new DC::Map;
+   # hack to make SURE we find the IP address all right
+   # can be removed once AnyEvent::DNS is proven stable.
+   if ($host eq "gameserver.deliantra.net") {
+      AnyEvent::DNS::a "dnstest.deliantra.net", sub {
+         if ($_[0] ne "80.101.114.108") { # Perl
+            status "dns failure, using hardcoded address";
+            $host = "129.13.162.95";
+         }
+         dc_connect $host, $port;
+      };
    } else {
-      warn $@;
+      dc_connect $host, $port;
-      status "unable to connect";
-      stop_game();
    }
 }
 sub stop_game {
    $LOGIN_BUTTON->set_text ("Login / Register");
          $CFG->{show_tips} = $value;
          0
       }
    );
-   $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size");
+   $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
    $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
       text    => $CFG->{logview_max_par},
-      tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
+      tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
                . "sends more messages than this number, older messages get removed to save memory and "
                . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
       on_changed => sub {
          my ($self, $value) = @_;
          $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
    $r
 }
 my %SORT_ORDER = (
-   type   => undef,
+   type   => sub {
+      sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
+   },
    mtime  => sub {
                 my $NOW = time;
                 sort {
                    my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
                    my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
          force_h => $::HEIGHT * 0.6,
          has_close_button => 1,
       ;
       $METASERVER = metaserver_dialog;
-      $MESSAGE_WINDOW = new DC::UI::Dockbar (name => 'message_window', title => 'Messages');
+      # the name is changed to not conflict with the older name as users could have hidden it
+      $MESSAGE_WINDOW = new DC::UI::Dockbar
+         name    => "message_window2",
+         title   => 'Messages',
+         force_w => $::WIDTH  * 0.6,
+         force_h => $::HEIGHT * 0.25,
+      ;
       $MESSAGE_DIST   = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
-      $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1,
+      $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
          filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
       $SETUP_NOTEBOOK->add_tab (Login    => $SETUP_LOGIN = login_setup,
          "Configure the server to play on, your username and password.");
       $SETUP_NOTEBOOK->add_tab (Server   => $SETUP_SERVER = server_setup,
       $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
       $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
          tooltip => "Toggles a dialog where you can configure all aspects of this client.");
-      $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
+#      $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
-         tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
+#         tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
       make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
       $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
          tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
       $BUTTONBAR->add (new DC::UI::Button
          text             => "Save Config",
          tooltip          => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
          on_activate => sub {
             $::CFG->{layout} = DC::UI::get_layout;
-            DC::write_cfg "$Deliantra::VARDIR/client.cf";
+            DC::write_cfg;
             status "Configuration Saved";
             0
          },
       );
       $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
          tooltip => "View Documentation");
       $BUTTONBAR->add (new DC::UI::Button
          text        => "Quit",
          tooltip     => "Terminates the program",
          on_activate => sub {
    EV::unloop;
    #d# TODO calling exit here hangs the process in some futex
 };
 {
+   DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
    if (-e "$Deliantra::VARDIR/client.cf") {
       DC::read_cfg "$Deliantra::VARDIR/client.cf";
    } else {
       #TODO: compatibility cruft
       DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
       print STDERR "INFO: used old configuration file\n";
    }
    DC::DB::Server::run;
+   if ($CFG->{db_schema} < 1) {
+      warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
+      DC::DB::nuke_db;
+      $CFG->{db_schema} = 1;
+      DC::write_cfg;
+   }
+   DC::DB::open_db;
    DC::UI::set_layout ($::CFG->{layout});
    my %DEF_CFG = (
       sdl_mode            => 0,
       pickup              => 0,
       inv_sort            => "mtime",
       default             => "profile", # default profile
       show_tips           => 1,
       logview_max_par     => 1000,
+      shift_fire_stop     => 0,
    );
    while (my ($k, $v) = each %DEF_CFG) {
       $CFG->{$k} = $v unless exists $CFG->{$k};
    }
 our $STARTUP_CANCEL = EV::idle sub {
    undef $::STARTUP_CANCEL;
    $startup_done->();
 };
+delete $SIG{__DIE__};
 EV::loop;
 #video_shutdown;
 #audio_shutdown;
 DC::OpenGL::quit;

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents): Revision 1.32 by root, Tue Mar 25 19:28:56 2008 UTC vs. Revision 1.48 by root, Mon Jul 7 08:02:17 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.32 by root, Tue Mar 25 19:28:56 2008 UTC vs.
Revision 1.48 by root, Mon Jul 7 08:02:17 2008 UTC