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.93 by root, Fri Jan 23 06:39:41 2009 UTC vs.
Revision 1.98 by root, Mon Dec 21 03:30:23 2009 UTC

… …
56 56
57 if ($^O eq "MSWin32") { 57 if ($^O eq "MSWin32") {
58 # pango is relocatable on win32 58 # pango is relocatable on win32
59 } else { 59 } else {
60 # OS X 60 # OS X
61 $ENV{FONTCONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
62 $ENV{FONTCONFIG_DIR} = $root; # no effect??!?!
63 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
64 $ENV{DYLD_LIBRARY_PATH} = $root; 62 $ENV{DYLD_LIBRARY_PATH} = $root;
65 chdir $root; # for pango modules, maybe other things 63 chdir $root; # for pango modules, maybe other things
66 } 64 }
67 65
68 unshift @INC, $root; 66 unshift @INC, $root;
69 } 67 }
70} 68}
71 69
72# prepend private library directory 70# prepend private library directory and prepare env
73BEGIN { 71BEGIN {
74 for (grep !ref, @INC) { 72 for (grep !ref, @INC) {
75 my $path = "$_/Deliantra/Client/private"; 73 my $path = "$_/Deliantra/Client/private";
76 if (-d $path) { 74 if (-d $path) {
77 unshift @INC, $path; 75 unshift @INC, $path;
… …
135 crash "CRASH/EV::DIED: $@" => 0; 133 crash "CRASH/EV::DIED: $@" => 0;
136 DC::fatal Carp::longmess $@; 134 DC::fatal Carp::longmess $@;
137}; 135};
138 136
139my $MAX_FPS = 60; 137my $MAX_FPS = 60;
138
139our $DEFAULT_SERVER = "gameserver.deliantra.net";
140 140
141our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 141our $META_SERVER = "http://metaserver.schmorp.de/current.json";
142 142
143our $LAST_REFRESH; 143our $LAST_REFRESH;
144our $NOW; 144our $NOW;
… …
550 $MUSIC_WANT = []; 550 $MUSIC_WANT = [];
551 @MUSIC_JINGLE = (); 551 @MUSIC_JINGLE = ();
552 %AUDIO_PLAY = (); 552 %AUDIO_PLAY = ();
553 %AUDIO_CHUNK = (); 553 %AUDIO_CHUNK = ();
554 554
555 DC::MixMusic::halt;
556 DC::Mix_AllocateChannels 0;
555 DC::Mix_CloseAudio if $SDL_MIXER; 557 DC::Mix_CloseAudio if $SDL_MIXER;
556 undef $SDL_MIXER; 558 undef $SDL_MIXER;
557} 559}
558 560
559############################################################################# 561#############################################################################
… …
830 ; 832 ;
831} 833}
832 834
833sub start_game { 835sub start_game {
834 status "logging in..."; 836 status "logging in...";
837
838 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
839 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
840 or return status "$server: unable to parse server address, try an empty field.";
835 841
836 $LOGIN_BUTTON->set_text ("Logout"); 842 $LOGIN_BUTTON->set_text ("Logout");
837 $SETUP_DIALOG->hide; 843 $SETUP_DIALOG->hide;
838
839 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
840 844
841 $MAP = new DC::Map; 845 $MAP = new DC::Map;
842 846
843 # hack to make SURE we find the IP address all right 847 # hack to make SURE we find the IP address all right
844 # can be removed once AnyEvent::DNS is proven stable. 848 # can be removed once AnyEvent::DNS is proven stable.
845 if ($host eq "gameserver.deliantra.net") { 849 if ($host eq "gameserver.deliantra.net") {
846 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 850 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
847 if ($_[0] ne "80.101.114.108") { # Perl 851 if ($_[0] ne "80.101.114.108") { # Perl
852 status "dns failure, trying differently";
853 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
854 unless (defined $host) {
848 status "dns failure, using hardcoded address"; 855 status "dns failure, using hardcoded address";
849 $host = "129.13.162.95"; 856 $host = "129.13.162.95";
857 }
850 } 858 }
851 859
852 dc_connect $host, $port; 860 dc_connect $host, $port;
853 }; 861 };
854 } else { 862 } else {
… …
1022 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1030 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1023 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1031 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1024 . "then disable this option. Changes take effect immdiately.", 1032 . "then disable this option. Changes take effect immdiately.",
1025 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1033 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
1026 ); 1034 );
1035
1036 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1037 $table->add_at (1, $row++, new DC::UI::CheckBox
1038 state => $CFG->{smooth_transitions},
1039 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1040 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1041 . "then disable this option. Requires Smooth Movement and OpenGL 1.4 or up. Changes take effect immdiately.",
1042 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1043 );
1044
1027 1045
1028 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1046 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
1029 $table->add_at (1, $row++, new DC::UI::Slider 1047 $table->add_at (1, $row++, new DC::UI::Slider
1030 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1048 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1031 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1049 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
… …
2561 2579
2562 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]); 2580 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2563 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2581 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2564 2582
2565 $CAVEAT_LABEL->set_text ("None :)"); 2583 $CAVEAT_LABEL->set_text ("None :)");
2584 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2585 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2566 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2586 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2567 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2587 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2568 2588
2569 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2589 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2570} 2590}
… …
2703 fullscreen => 1, 2723 fullscreen => 1,
2704 fast => 0, 2724 fast => 0,
2705 force_opengl11 => undef, 2725 force_opengl11 => undef,
2706 disable_alpha => 0, 2726 disable_alpha => 0,
2707 smooth_movement => 1, 2727 smooth_movement => 1,
2728 smooth_transitions => 1,
2708 texture_compression => 1, 2729 texture_compression => 1,
2709 map_scale => 1, 2730 map_scale => 1,
2710 fow_enable => 1, 2731 fow_enable => 1,
2711 fow_intensity => 0, 2732 fow_intensity => 0,
2712 map_smoothing => 1, 2733 map_smoothing => 1,
… …
2756 } 2777 }
2757 } 2778 }
2758 2779
2759 sdl_init; 2780 sdl_init;
2760 2781
2782 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2783 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2784
2761 { 2785 {
2762 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2786 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2763 DejaVuSans.ttf 2787 DejaVuSans.ttf
2764 DejaVuSansMono.ttf 2788 DejaVuSansMono.ttf
2765 DejaVuSans-Bold.ttf 2789 DejaVuSans-Bold.ttf
2766 DejaVuSansMono-Bold.ttf 2790 DejaVuSansMono-Bold.ttf
2767 DejaVuSans-Oblique.ttf 2791 DejaVuSans-Oblique.ttf
2768 DejaVuSansMono-Oblique.ttf 2792 DejaVuSansMono-Oblique.ttf
2769 DejaVuSans-BoldOblique.ttf 2793 DejaVuSans-BoldOblique.ttf
2770 DejaVuSansMono-BoldOblique.ttf 2794 DejaVuSansMono-BoldOblique.ttf
2795 mona.ttf
2771 ); 2796 );
2772 2797
2773 DC::add_font $_ for @fonts; 2798 DC::add_font $_ for @fonts;
2774 2799
2775 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2800 $FONT_PROP = new_from_file DC::Font $fonts[0];

Diff Legend

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