… | |
… | |
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 |
73 | BEGIN { |
71 | BEGIN { |
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; |
… | |
… | |
550 | $MUSIC_WANT = []; |
548 | $MUSIC_WANT = []; |
551 | @MUSIC_JINGLE = (); |
549 | @MUSIC_JINGLE = (); |
552 | %AUDIO_PLAY = (); |
550 | %AUDIO_PLAY = (); |
553 | %AUDIO_CHUNK = (); |
551 | %AUDIO_CHUNK = (); |
554 | |
552 | |
|
|
553 | DC::MixMusic::halt; |
|
|
554 | DC::Mix_AllocateChannels 0; |
555 | DC::Mix_CloseAudio if $SDL_MIXER; |
555 | DC::Mix_CloseAudio if $SDL_MIXER; |
556 | undef $SDL_MIXER; |
556 | undef $SDL_MIXER; |
557 | } |
557 | } |
558 | |
558 | |
559 | ############################################################################# |
559 | ############################################################################# |
… | |
… | |
818 | |
818 | |
819 | on_connect => sub { |
819 | on_connect => sub { |
820 | if ($_[0]) { |
820 | if ($_[0]) { |
821 | DC::lowdelay fileno $CONN->{fh}; |
821 | DC::lowdelay fileno $CONN->{fh}; |
822 | |
822 | |
823 | status "login successful"; |
823 | status "successfully connected to the server"; |
824 | } else { |
824 | } else { |
825 | undef $CONN; |
825 | undef $CONN; |
826 | status "unable to connect: $!"; |
826 | status "unable to connect: $!"; |
827 | stop_game(); |
827 | stop_game(); |
828 | } |
828 | } |
… | |
… | |
843 | # hack to make SURE we find the IP address all right |
843 | # hack to make SURE we find the IP address all right |
844 | # can be removed once AnyEvent::DNS is proven stable. |
844 | # can be removed once AnyEvent::DNS is proven stable. |
845 | if ($host eq "gameserver.deliantra.net") { |
845 | if ($host eq "gameserver.deliantra.net") { |
846 | AnyEvent::DNS::a "dnstest.deliantra.net", sub { |
846 | AnyEvent::DNS::a "dnstest.deliantra.net", sub { |
847 | if ($_[0] ne "80.101.114.108") { # Perl |
847 | if ($_[0] ne "80.101.114.108") { # Perl |
|
|
848 | status "dns failure, trying differently"; |
|
|
849 | $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" }; |
|
|
850 | unless (defined $host) { |
848 | status "dns failure, using hardcoded address"; |
851 | status "dns failure, using hardcoded address"; |
849 | $host = "129.13.162.95"; |
852 | $host = "129.13.162.95"; |
|
|
853 | } |
850 | } |
854 | } |
851 | |
855 | |
852 | dc_connect $host, $port; |
856 | dc_connect $host, $port; |
853 | }; |
857 | }; |
854 | } else { |
858 | } else { |
… | |
… | |
2731 | default => "profile", # default profile |
2735 | default => "profile", # default profile |
2732 | show_tips => 1, |
2736 | show_tips => 1, |
2733 | logview_max_par => 1000, |
2737 | logview_max_par => 1000, |
2734 | shift_fire_stop => 0, |
2738 | shift_fire_stop => 0, |
2735 | uitheme => "wood", |
2739 | uitheme => "wood", |
|
|
2740 | map_shift_x => -24, # arbitrary |
|
|
2741 | map_shift_y => +24, # arbitrary |
2736 | ); |
2742 | ); |
2737 | |
2743 | |
2738 | while (my ($k, $v) = each %DEF_CFG) { |
2744 | while (my ($k, $v) = each %DEF_CFG) { |
2739 | $CFG->{$k} = $v unless exists $CFG->{$k}; |
2745 | $CFG->{$k} = $v unless exists $CFG->{$k}; |
2740 | } |
2746 | } |
… | |
… | |
2754 | } |
2760 | } |
2755 | } |
2761 | } |
2756 | |
2762 | |
2757 | sdl_init; |
2763 | sdl_init; |
2758 | |
2764 | |
|
|
2765 | $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf"; |
|
|
2766 | $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts"; |
|
|
2767 | |
2759 | { |
2768 | { |
2760 | my @fonts = map DC::find_rcfile "fonts/$_", qw( |
2769 | my @fonts = map DC::find_rcfile "fonts/$_", qw( |
2761 | DejaVuSans.ttf |
2770 | DejaVuSans.ttf |
2762 | DejaVuSansMono.ttf |
2771 | DejaVuSansMono.ttf |
2763 | DejaVuSans-Bold.ttf |
2772 | DejaVuSans-Bold.ttf |
2764 | DejaVuSansMono-Bold.ttf |
2773 | DejaVuSansMono-Bold.ttf |
2765 | DejaVuSans-Oblique.ttf |
2774 | DejaVuSans-Oblique.ttf |
2766 | DejaVuSansMono-Oblique.ttf |
2775 | DejaVuSansMono-Oblique.ttf |
2767 | DejaVuSans-BoldOblique.ttf |
2776 | DejaVuSans-BoldOblique.ttf |
2768 | DejaVuSansMono-BoldOblique.ttf |
2777 | DejaVuSansMono-BoldOblique.ttf |
|
|
2778 | mona.ttf |
2769 | ); |
2779 | ); |
2770 | |
2780 | |
2771 | DC::add_font $_ for @fonts; |
2781 | DC::add_font $_ for @fonts; |
2772 | |
2782 | |
2773 | $FONT_PROP = new_from_file DC::Font $fonts[0]; |
2783 | $FONT_PROP = new_from_file DC::Font $fonts[0]; |