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.89 by root, Mon Jan 12 03:11:05 2009 UTC vs.
Revision 1.100 by root, Tue Dec 22 01:37:42 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;
… …
205our $FLOORBOX; 205our $FLOORBOX;
206our $GAUGES; 206our $GAUGES;
207our $STATWIDS; 207our $STATWIDS;
208 208
209our $SDL_ACTIVE; 209our $SDL_ACTIVE;
210our %SDL_CB; 210our @SDL_CB;
211 211
212our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
213our $STATUSBOX; 213our $STATUSBOX;
214our $MODBOX; 214our $MODBOX;
215our $DEBUG_STATUS; 215our $DEBUG_STATUS;
… …
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#############################################################################
… …
818 820
819 on_connect => sub { 821 on_connect => sub {
820 if ($_[0]) { 822 if ($_[0]) {
821 DC::lowdelay fileno $CONN->{fh}; 823 DC::lowdelay fileno $CONN->{fh};
822 824
823 status "login successful"; 825 status "successfully connected to the server";
824 } else { 826 } else {
825 undef $CONN; 827 undef $CONN;
826 status "unable to connect: $!"; 828 status "unable to connect: $!";
827 stop_game(); 829 stop_game();
828 } 830 }
… …
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 {
… …
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 );
1027 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 Multitexturing. Changes take effect immdiately.",
1042 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1043 );
1044
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.",
1032 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1050 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"); 1062 $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 1063 $table->add_at (1, $row++, new DC::UI::CheckBox
1046 state => $CFG->{fow_enable}, 1064 state => $CFG->{fow_enable},
1047 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1065 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 } 1066 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1067 );
1068
1069 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1070 $table->add_at (1, $row++, new DC::UI::ImageButton
1071 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1072 bg => [0.3, 0.3, 0.2],
1073 force_w => 64,
1074 force_h => 64,
1075 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.",
1076 on_activate => sub {
1077 my ($self) = @_;
1078 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1079 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1080 $MAPWIDGET->update;
1081 }
1049 ); 1082 );
1050 1083
1051 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1084 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
1052 $table->add_at (1, $row++, new DC::UI::Slider 1085 $table->add_at (1, $row++, new DC::UI::Slider
1053 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1086 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
… …
2258 ); 2291 );
2259 2292
2260 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress 2293 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2261 padding_x => 6, 2294 padding_x => 6,
2262 padding_y => 3, 2295 padding_y => 3,
2263 tooltip => "This progress bar shows your progress towards the next character level.", 2296 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2264 template => " Exp: 888,888,888,888 (lvl 188) ", 2297 template => " Exp: 888,888,888,888 (lvl 188) ",
2265 ); 2298 );
2266 2299
2267 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better? 2300 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2268 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character " 2301 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
… …
2481 2514
2482 DC::UI::Toplevel->new ( 2515 DC::UI::Toplevel->new (
2483 title => "Minimap", 2516 title => "Minimap",
2484 name => "mapmap", 2517 name => "mapmap",
2485 x => 0, 2518 x => 0,
2486 y => $FONTSIZE + 8, 2519 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2487 border_bg => [1, 1, 1, 192/255], 2520 border_bg => [1, 1, 1, 192/255],
2488 bg => [1, 1, 1, 0], 2521 bg => [1, 1, 1, 0],
2489 child => ($MAPMAP = new DC::MapWidget::MapMap 2522 child => ($MAPMAP = new DC::MapWidget::MapMap
2490 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.", 2523 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2491 ), 2524 ),
… …
2520 $METASERVER = metaserver_dialog; 2553 $METASERVER = metaserver_dialog;
2521 # the name is changed to not conflict with the older name as users could have hidden it 2554 # the name is changed to not conflict with the older name as users could have hidden it
2522 $MESSAGE_WINDOW = new DC::UI::Dockbar 2555 $MESSAGE_WINDOW = new DC::UI::Dockbar
2523 name => "message_window2", 2556 name => "message_window2",
2524 title => 'Messages', 2557 title => 'Messages',
2558 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2525 force_w => $::WIDTH * 0.6, 2559 force_w => $::WIDTH * 0.6,
2526 force_h => $::HEIGHT * 0.25, 2560 force_h => $::HEIGHT * 0.25,
2527 ; 2561 ;
2528 2562
2529 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2563 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2560 2594
2561 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]); 2595 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2562 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2596 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2563 2597
2564 $CAVEAT_LABEL->set_text ("None :)"); 2598 $CAVEAT_LABEL->set_text ("None :)");
2599 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2600 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2565 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2601 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2566 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2602 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2567 2603
2568 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2604 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2569} 2605}
… …
2597my $want_refresh = EV::prepare_ns \&force_refresh; 2633my $want_refresh = EV::prepare_ns \&force_refresh;
2598 2634
2599my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2635my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2600 $NOW = EV::now; 2636 $NOW = EV::now;
2601 2637
2602 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2638 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2603 for DC::poll_events; 2639 for DC::poll_events;
2604 2640
2605 if (%animate_object) { 2641 if (%animate_object) {
2606 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2642 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2607 $WANT_REFRESH = 1; 2643 $WANT_REFRESH = 1;
… …
2619sub animation_stop { 2655sub animation_stop {
2620 my ($widget) = @_; 2656 my ($widget) = @_;
2621 delete $animate_object{$widget}; 2657 delete $animate_object{$widget};
2622} 2658}
2623 2659
2624%SDL_CB = (
2625 DC::SDL_QUIT => sub { 2660$SDL_CB[DC::SDL_QUIT] = sub {
2626 crash "SDL_QUIT"; 2661 crash "SDL_QUIT";
2627 EV::unloop EV::UNLOOP_ALL; 2662 EV::unloop EV::UNLOOP_ALL;
2628 }, 2663};
2629 DC::SDL_VIDEORESIZE => sub { 2664$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2630 },
2631 DC::SDL_VIDEOEXPOSE => sub { 2665$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2632 DC::UI::full_refresh; 2666 DC::UI::full_refresh;
2633 }, 2667};
2634 DC::SDL_ACTIVEEVENT => sub { 2668$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2635# not useful, as APPACTIVE includes only iconified state, not unmapped 2669# not useful, as APPACTIVE includes only iconified state, not unmapped
2636# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2670# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2637# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2671# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2638# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2672# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2639# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2673# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2640# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2674# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2641 }, 2675};
2642 DC::SDL_KEYDOWN => sub { 2676$SDL_CB[DC::SDL_KEYDOWN] = sub {
2643 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2677 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2644 # alt-enter 2678 # alt-enter
2645 video_shutdown; 2679 video_shutdown;
2646 $FULLSCREEN_ENABLE->toggle; 2680 $FULLSCREEN_ENABLE->toggle;
2647 video_init; 2681 video_init;
2648 } else { 2682 } else {
2649 &DC::UI::feed_sdl_key_down_event; 2683 &DC::UI::feed_sdl_key_down_event;
2650 } 2684 }
2651 update_modbox; 2685 update_modbox;
2652 }, 2686};
2653 DC::SDL_KEYUP => sub { 2687$SDL_CB[DC::SDL_KEYUP] = sub {
2654 &DC::UI::feed_sdl_key_up_event; 2688 &DC::UI::feed_sdl_key_up_event;
2655 update_modbox; 2689 update_modbox;
2656 }, 2690};
2657 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2691$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2658 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2692$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2659 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2693$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2660 DC::SDL_USEREVENT => sub { 2694$SDL_CB[DC::SDL_USEREVENT] = sub {
2661 if ($_[0]{code} == 1) { 2695 if ($_[0]{code} == 1) {
2662 audio_channel_finished $_[0]{data1}; 2696 audio_channel_finished $_[0]{data1};
2663 } elsif ($_[0]{code} == 0) { 2697 } elsif ($_[0]{code} == 0) {
2664 audio_music_finished; 2698 audio_music_finished;
2665 }
2666 }, 2699 }
2667); 2700};
2668 2701
2669############################################################################# 2702#############################################################################
2670 2703
2671$SIG{INT} = $SIG{TERM} = sub { 2704$SIG{INT} = $SIG{TERM} = sub {
2672 EV::unloop; 2705 EV::unloop;
… …
2705 fullscreen => 1, 2738 fullscreen => 1,
2706 fast => 0, 2739 fast => 0,
2707 force_opengl11 => undef, 2740 force_opengl11 => undef,
2708 disable_alpha => 0, 2741 disable_alpha => 0,
2709 smooth_movement => 1, 2742 smooth_movement => 1,
2743 smooth_transitions => 1,
2710 texture_compression => 1, 2744 texture_compression => 1,
2711 map_scale => 1, 2745 map_scale => 1,
2712 fow_enable => 1, 2746 fow_enable => 1,
2713 fow_intensity => 0, 2747 fow_intensity => 0,
2748 fow_texture => 0,
2714 map_smoothing => 1, 2749 map_smoothing => 1,
2715 gui_fontsize => 1, 2750 gui_fontsize => 1,
2716 log_fontsize => 0.7, 2751 log_fontsize => 0.7,
2717 gauge_fontsize => 1, 2752 gauge_fontsize => 1,
2718 gauge_size => 0.35, 2753 gauge_size => 0.35,
… …
2733 default => "profile", # default profile 2768 default => "profile", # default profile
2734 show_tips => 1, 2769 show_tips => 1,
2735 logview_max_par => 1000, 2770 logview_max_par => 1000,
2736 shift_fire_stop => 0, 2771 shift_fire_stop => 0,
2737 uitheme => "wood", 2772 uitheme => "wood",
2773 map_shift_x => -24, # arbitrary
2774 map_shift_y => +24, # arbitrary
2738 ); 2775 );
2739 2776
2740 while (my ($k, $v) = each %DEF_CFG) { 2777 while (my ($k, $v) = each %DEF_CFG) {
2741 $CFG->{$k} = $v unless exists $CFG->{$k}; 2778 $CFG->{$k} = $v unless exists $CFG->{$k};
2742 } 2779 }
… …
2756 } 2793 }
2757 } 2794 }
2758 2795
2759 sdl_init; 2796 sdl_init;
2760 2797
2798 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2799 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2800
2761 { 2801 {
2762 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2802 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2763 DejaVuSans.ttf 2803 DejaVuSans.ttf
2764 DejaVuSansMono.ttf 2804 DejaVuSansMono.ttf
2765 DejaVuSans-Bold.ttf 2805 DejaVuSans-Bold.ttf
2766 DejaVuSansMono-Bold.ttf 2806 DejaVuSansMono-Bold.ttf
2767 DejaVuSans-Oblique.ttf 2807 DejaVuSans-Oblique.ttf
2768 DejaVuSansMono-Oblique.ttf 2808 DejaVuSansMono-Oblique.ttf
2769 DejaVuSans-BoldOblique.ttf 2809 DejaVuSans-BoldOblique.ttf
2770 DejaVuSansMono-BoldOblique.ttf 2810 DejaVuSansMono-BoldOblique.ttf
2811 mona.ttf
2771 ); 2812 );
2772 2813
2773 DC::add_font $_ for @fonts; 2814 DC::add_font $_ for @fonts;
2774 2815
2775 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2816 $FONT_PROP = new_from_file DC::Font $fonts[0];

Diff Legend

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