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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.38 by root, Mon May 5 16:26:11 2008 UTC vs.
Revision 1.44 by root, Mon May 26 03:34:02 2008 UTC

 use Deliantra;
 use Deliantra::Protocol::Constants;
 use Compress::LZF;
+use DC;
-use DC; BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } }
+#d# 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;
    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 {
+            } else {
-      warn $@;
+               undef $CONN;
-      status "unable to connect";
+               status "unable to connect: $!";
-      stop_game();
+               stop_game();
+            }
+         },
-   }
+   ;
 }
 sub stop_game {
    $LOGIN_BUTTON->set_text ("Login / Register");
    $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
    $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;
+      # the name is changed to not conflict with the older name as users could have hidden it
-      $MESSAGE_WINDOW = new DC::UI::Dockbar (title => 'Messages');
+      $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,
          filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
       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};
    }

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents): Revision 1.38 by root, Mon May 5 16:26:11 2008 UTC vs. Revision 1.44 by root, Mon May 26 03:34:02 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.38 by root, Mon May 5 16:26:11 2008 UTC vs.
Revision 1.44 by root, Mon May 26 03:34:02 2008 UTC