ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/deliantra
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.37 by root, Mon May 5 16:19:19 2008 UTC vs.
Revision 1.49 by root, Mon Jul 7 12:56:07 2008 UTC

… …
97use List::Util qw(max min); 97use List::Util qw(max min);
98 98
99use Deliantra; 99use Deliantra;
100use Deliantra::Protocol::Constants; 100use Deliantra::Protocol::Constants;
101 101
102use AnyEvent::DNS;
103
102use Compress::LZF; 104use Compress::LZF;
103 105
106use DC;
104use DC; BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } } 107BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } }
105use DC::OpenGL (); 108use DC::OpenGL ();
106use DC::Protocol; 109use DC::Protocol;
107use DC::DB; 110use DC::DB;
108use DC::UI; 111use DC::UI;
109use DC::UI::Canvas; 112use DC::UI::Canvas;
… …
664 # right: accept 667 # right: accept
665 $table->add_at (4, 0, new DC::UI::Button 668 $table->add_at (4, 0, new DC::UI::Button
666 text => "Accept", 669 text => "Accept",
667 on_activate => sub { 670 on_activate => sub {
668 $conn->send ("reply n"); 671 $conn->send ("reply n");
669 $STATS_PAGE->hide;
670 destroy_query_dialog $conn; 672 destroy_query_dialog $conn;
671 0 673 0
672 }, 674 },
673 ); 675 );
674 676
… …
726 728
727 $vbox->add (@dialog); 729 $vbox->add (@dialog);
728 $dialog->show; 730 $dialog->show;
729} 731}
730 732
731sub start_game { 733sub dc_connect {
732 status "logging in..."; 734 my ($host, $port) = @_;
733
734 $LOGIN_BUTTON->set_text ("Logout");
735 $SETUP_DIALOG->hide;
736 735
737 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 736 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
738 737
739 my ($host, $port) = split /:/, $PROFILE->{host};
740
741 $MAP = new DC::Map;
742
743 $CONN = eval { 738 $CONN =
744 new DC::Protocol 739 new DC::Protocol
745 host => $host, 740 host => $host,
746 port => $port || 13327, 741 port => $port || 13327,
747 user => $PROFILE->{user}, 742 user => $PROFILE->{user},
748 pass => $PROFILE->{password}, 743 pass => $PROFILE->{password},
… …
758 query => \&server_query, 753 query => \&server_query,
759 754
760 setup_req => { 755 setup_req => {
761 smoothing => $CFG->{map_smoothing}*1, 756 smoothing => $CFG->{map_smoothing}*1,
762 }, 757 },
763 };
764 758
765 if ($CONN) { 759 on_connect => sub {
760 if ($_[0]) {
766 DC::lowdelay fileno $CONN->{fh}; 761 DC::lowdelay fileno $CONN->{fh};
767 762
768 status "login successful"; 763 status "login successful";
764 } else {
765 undef $CONN;
766 status "unable to connect: $!";
767 stop_game();
768 }
769 },
770 ;
771}
772
773sub start_game {
774 status "logging in...";
775
776 $LOGIN_BUTTON->set_text ("Logout");
777 $SETUP_DIALOG->hide;
778
779 my ($host, $port) = split /:/, $PROFILE->{host};
780
781 $MAP = new DC::Map;
782
783 # hack to make SURE we find the IP address all right
784 # can be removed once AnyEvent::DNS is proven stable.
785 if ($host eq "gameserver.deliantra.net") {
786 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
787 if ($_[0] ne "80.101.114.108") { # Perl
788 status "dns failure, using hardcoded address";
789 $host = "129.13.162.95";
790 }
791
792 dc_connect $host, $port;
793 };
769 } else { 794 } else {
770 warn $@; 795 dc_connect $host, $port;
771 status "unable to connect";
772 stop_game();
773 } 796 }
774} 797}
775 798
776sub stop_game { 799sub stop_game {
777 $LOGIN_BUTTON->set_text ("Login / Register"); 800 $LOGIN_BUTTON->set_text ("Login / Register");
… …
1743 1766
1744 $r 1767 $r
1745} 1768}
1746 1769
1747my %SORT_ORDER = ( 1770my %SORT_ORDER = (
1748 type => undef, 1771 type => sub {
1772 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1773 },
1749 mtime => sub { 1774 mtime => sub {
1750 my $NOW = time; 1775 my $NOW = time;
1751 sort { 1776 sort {
1752 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1777 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1753 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1778 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
… …
2242 force_h => $::HEIGHT * 0.6, 2267 force_h => $::HEIGHT * 0.6,
2243 has_close_button => 1, 2268 has_close_button => 1,
2244 ; 2269 ;
2245 2270
2246 $METASERVER = metaserver_dialog; 2271 $METASERVER = metaserver_dialog;
2272 # the name is changed to not conflict with the older name as users could have hidden it
2247 $MESSAGE_WINDOW = new DC::UI::Dockbar (title => 'Messages'); 2273 $MESSAGE_WINDOW = new DC::UI::Dockbar
2274 name => "message_window2",
2275 title => 'Messages',
2276 force_w => $::WIDTH * 0.6,
2277 force_h => $::HEIGHT * 0.25,
2278 ;
2279
2248 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2280 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2249 2281
2250 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1, 2282 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2251 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2283 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2252 2284
2253 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup, 2285 $SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
2254 "Configure the server to play on, your username and password."); 2286 "Configure the server to play on, your username and password.");
2255 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup, 2287 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
… …
2294 }, 2326 },
2295 ); 2327 );
2296 2328
2297 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 2329 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2298 tooltip => "View Documentation"); 2330 tooltip => "View Documentation");
2299
2300 2331
2301 $BUTTONBAR->add (new DC::UI::Button 2332 $BUTTONBAR->add (new DC::UI::Button
2302 text => "Quit", 2333 text => "Quit",
2303 tooltip => "Terminates the program", 2334 tooltip => "Terminates the program",
2304 on_activate => sub { 2335 on_activate => sub {
… …
2475 pickup => 0, 2506 pickup => 0,
2476 inv_sort => "mtime", 2507 inv_sort => "mtime",
2477 default => "profile", # default profile 2508 default => "profile", # default profile
2478 show_tips => 1, 2509 show_tips => 1,
2479 logview_max_par => 1000, 2510 logview_max_par => 1000,
2511 shift_fire_stop => 0,
2480 ); 2512 );
2481 2513
2482 while (my ($k, $v) = each %DEF_CFG) { 2514 while (my ($k, $v) = each %DEF_CFG) {
2483 $CFG->{$k} = $v unless exists $CFG->{$k}; 2515 $CFG->{$k} = $v unless exists $CFG->{$k};
2484 } 2516 }

Diff Legend

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