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.90 by root, Mon Jan 12 03:49:35 2009 UTC vs.
Revision 1.102 by elmex, Sat Mar 20 00:50:06 2010 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;
… …
541 sub audio_tab_update; 541 sub audio_tab_update;
542 audio_tab_update; 542 audio_tab_update;
543} 543}
544 544
545sub audio_shutdown { 545sub audio_shutdown {
546 if ($SDL_MIXER) {
547 DC::MixMusic::halt;
548 DC::Mix_AllocateChannels 0;
549 }
550
546 undef $MUSIC_PLAYER; 551 undef $MUSIC_PLAYER;
547 undef $MUSIC_PLAYING_META; 552 undef $MUSIC_PLAYING_META;
548 undef $MUSIC_PLAYING_DATA; 553 undef $MUSIC_PLAYING_DATA;
549 554
550 $MUSIC_WANT = []; 555 $MUSIC_WANT = [];
… …
818 823
819 on_connect => sub { 824 on_connect => sub {
820 if ($_[0]) { 825 if ($_[0]) {
821 DC::lowdelay fileno $CONN->{fh}; 826 DC::lowdelay fileno $CONN->{fh};
822 827
823 status "login successful"; 828 status "successfully connected to the server";
824 } else { 829 } else {
825 undef $CONN; 830 undef $CONN;
826 status "unable to connect: $!"; 831 status "unable to connect: $!";
827 stop_game(); 832 stop_game();
828 } 833 }
… …
830 ; 835 ;
831} 836}
832 837
833sub start_game { 838sub start_game {
834 status "logging in..."; 839 status "logging in...";
840
841 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
842 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
843 or return status "$server: unable to parse server address, try an empty field.";
835 844
836 $LOGIN_BUTTON->set_text ("Logout"); 845 $LOGIN_BUTTON->set_text ("Logout");
837 $SETUP_DIALOG->hide; 846 $SETUP_DIALOG->hide;
838
839 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
840 847
841 $MAP = new DC::Map; 848 $MAP = new DC::Map;
842 849
843 # hack to make SURE we find the IP address all right 850 # hack to make SURE we find the IP address all right
844 # can be removed once AnyEvent::DNS is proven stable. 851 # can be removed once AnyEvent::DNS is proven stable.
845 if ($host eq "gameserver.deliantra.net") { 852 if ($host eq "gameserver.deliantra.net") {
846 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 853 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
847 if ($_[0] ne "80.101.114.108") { # Perl 854 if ($_[0] ne "80.101.114.108") { # Perl
855 status "dns failure, trying differently";
856 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
857 unless (defined $host) {
848 status "dns failure, using hardcoded address"; 858 status "dns failure, using hardcoded address";
849 $host = "129.13.162.95"; 859 $host = "129.13.162.95";
860 }
850 } 861 }
851 862
852 dc_connect $host, $port; 863 dc_connect $host, $port;
853 }; 864 };
854 } else { 865 } else {
… …
1023 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1034 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1024 . "then disable this option. Changes take effect immdiately.", 1035 . "then disable this option. Changes take effect immdiately.",
1025 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1036 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
1026 ); 1037 );
1027 1038
1039 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1040 $table->add_at (1, $row++, new DC::UI::CheckBox
1041 state => $CFG->{smooth_transitions},
1042 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1043 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1044 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1045 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1046 );
1047
1048
1028 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1049 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
1029 $table->add_at (1, $row++, new DC::UI::Slider 1050 $table->add_at (1, $row++, new DC::UI::Slider
1030 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1051 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1031 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1052 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1032 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1053 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
… …
1044 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1065 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
1045 $table->add_at (1, $row++, new DC::UI::CheckBox 1066 $table->add_at (1, $row++, new DC::UI::CheckBox
1046 state => $CFG->{fow_enable}, 1067 state => $CFG->{fow_enable},
1047 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1068 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
1048 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1069 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1070 );
1071
1072 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1073 $table->add_at (1, $row++, new DC::UI::ImageButton
1074 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1075 bg => [0.3, 0.3, 0.2],
1076 force_w => 64,
1077 force_h => 64,
1078 tooltip => "<b>Fog of War Pattern.</b> The pattern that is overlaid over areas hidden from view. Click to cycle through various alternatives. Changes are instant.",
1079 on_activate => sub {
1080 my ($self) = @_;
1081 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1082 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1083 $MAPWIDGET->update;
1084 }
1049 ); 1085 );
1050 1086
1051 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1087 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
1052 $table->add_at (1, $row++, new DC::UI::Slider 1088 $table->add_at (1, $row++, new DC::UI::Slider
1053 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1089 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
… …
1105 1141
1106 my $text = !$freq 1142 my $text = !$freq
1107 ? "audio is off" 1143 ? "audio is off"
1108 : "audio is enabled\n" 1144 : "audio is enabled\n"
1109 . "frequency (Hz): $freq\n" 1145 . "frequency (Hz): $freq\n"
1110 . "channels: $chans"; 1146 . "channels: $chans\n"
1147 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1148 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1111 1149
1112 $AUDIO_INFO->set_text ($text); 1150 $AUDIO_INFO->set_text ($text);
1113} 1151}
1114 1152
1115sub audio_setup { 1153sub audio_setup {
… …
2481 2519
2482 DC::UI::Toplevel->new ( 2520 DC::UI::Toplevel->new (
2483 title => "Minimap", 2521 title => "Minimap",
2484 name => "mapmap", 2522 name => "mapmap",
2485 x => 0, 2523 x => 0,
2486 y => $FONTSIZE + 8, 2524 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2487 border_bg => [1, 1, 1, 192/255], 2525 border_bg => [1, 1, 1, 192/255],
2488 bg => [1, 1, 1, 0], 2526 bg => [1, 1, 1, 0],
2489 child => ($MAPMAP = new DC::MapWidget::MapMap 2527 child => ($MAPMAP = new DC::MapWidget::MapMap
2490 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.", 2528 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2491 ), 2529 ),
… …
2520 $METASERVER = metaserver_dialog; 2558 $METASERVER = metaserver_dialog;
2521 # the name is changed to not conflict with the older name as users could have hidden it 2559 # the name is changed to not conflict with the older name as users could have hidden it
2522 $MESSAGE_WINDOW = new DC::UI::Dockbar 2560 $MESSAGE_WINDOW = new DC::UI::Dockbar
2523 name => "message_window2", 2561 name => "message_window2",
2524 title => 'Messages', 2562 title => 'Messages',
2563 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2525 force_w => $::WIDTH * 0.6, 2564 force_w => $::WIDTH * 0.6,
2526 force_h => $::HEIGHT * 0.25, 2565 force_h => $::HEIGHT * 0.25,
2527 ; 2566 ;
2528 2567
2529 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2568 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2560 2599
2561 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]); 2600 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2562 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2601 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2563 2602
2564 $CAVEAT_LABEL->set_text ("None :)"); 2603 $CAVEAT_LABEL->set_text ("None :)");
2604 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2605 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2565 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2606 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2566 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2607 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2567 2608
2568 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2609 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2569} 2610}
… …
2702 fullscreen => 1, 2743 fullscreen => 1,
2703 fast => 0, 2744 fast => 0,
2704 force_opengl11 => undef, 2745 force_opengl11 => undef,
2705 disable_alpha => 0, 2746 disable_alpha => 0,
2706 smooth_movement => 1, 2747 smooth_movement => 1,
2748 smooth_transitions => 1,
2707 texture_compression => 1, 2749 texture_compression => 1,
2708 map_scale => 1, 2750 map_scale => 1,
2709 fow_enable => 1, 2751 fow_enable => 1,
2710 fow_intensity => 0, 2752 fow_intensity => 0,
2753 fow_texture => 0,
2711 map_smoothing => 1, 2754 map_smoothing => 1,
2712 gui_fontsize => 1, 2755 gui_fontsize => 1,
2713 log_fontsize => 0.7, 2756 log_fontsize => 0.7,
2714 gauge_fontsize => 1, 2757 gauge_fontsize => 1,
2715 gauge_size => 0.35, 2758 gauge_size => 0.35,
… …
2730 default => "profile", # default profile 2773 default => "profile", # default profile
2731 show_tips => 1, 2774 show_tips => 1,
2732 logview_max_par => 1000, 2775 logview_max_par => 1000,
2733 shift_fire_stop => 0, 2776 shift_fire_stop => 0,
2734 uitheme => "wood", 2777 uitheme => "wood",
2735 ); 2778 map_shift_x => -24, # arbitrary
2779 map_shift_y => +24, # arbitrary
2736 2780 );
2781
2737 while (my ($k, $v) = each %DEF_CFG) { 2782 while (my ($k, $v) = each %DEF_CFG) {
2738 $CFG->{$k} = $v unless exists $CFG->{$k}; 2783 $CFG->{$k} = $v unless exists $CFG->{$k};
2739 } 2784 }
2740 2785
2741 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2786 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2742 $PROFILE = $CFG->{profile}{default}; 2787 $PROFILE = $CFG->{profile}{default};
2788
2789 $PROFILE->{host} = $ARGV[0] if @ARGV > 0;
2790 $PROFILE->{user} = $ARGV[1] if @ARGV > 1;
2791 $PROFILE->{password} = $ARGV[2] if @ARGV > 2;
2743 2792
2744 # convert old bindings (only default profile matters) 2793 # convert old bindings (only default profile matters)
2745 if (my $bindings = delete $PROFILE->{bindings}) { 2794 if (my $bindings = delete $PROFILE->{bindings}) {
2746 while (my ($mod, $syms) = each %$bindings) { 2795 while (my ($mod, $syms) = each %$bindings) {
2747 while (my ($sym, $cmds) = each %$syms) { 2796 while (my ($sym, $cmds) = each %$syms) {
… …
2753 } 2802 }
2754 } 2803 }
2755 2804
2756 sdl_init; 2805 sdl_init;
2757 2806
2807 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2808 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2809
2758 { 2810 {
2759 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2811 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2760 DejaVuSans.ttf 2812 DejaVuSans.ttf
2761 DejaVuSansMono.ttf 2813 DejaVuSansMono.ttf
2762 DejaVuSans-Bold.ttf 2814 DejaVuSans-Bold.ttf
2763 DejaVuSansMono-Bold.ttf 2815 DejaVuSansMono-Bold.ttf
2764 DejaVuSans-Oblique.ttf 2816 DejaVuSans-Oblique.ttf
2765 DejaVuSansMono-Oblique.ttf 2817 DejaVuSansMono-Oblique.ttf
2766 DejaVuSans-BoldOblique.ttf 2818 DejaVuSans-BoldOblique.ttf
2767 DejaVuSansMono-BoldOblique.ttf 2819 DejaVuSansMono-BoldOblique.ttf
2820 mona.ttf
2768 ); 2821 );
2769 2822
2770 DC::add_font $_ for @fonts; 2823 DC::add_font $_ for @fonts;
2771 2824
2772 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2825 $FONT_PROP = new_from_file DC::Font $fonts[0];
2773 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2826 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2774 2827
2775 $FONT_PROP->make_default; 2828 $FONT_PROP->make_default;
2776 2829

Diff Legend

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