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.110 by root, Mon Apr 12 02:03:33 2010 UTC vs.
Revision 1.112 by root, Thu Apr 22 11:18:04 2010 UTC

854 854
855 # hack to make SURE we find the IP address all right 855 # hack to make SURE we find the IP address all right
856 # can be removed once AnyEvent::DNS is proven stable. 856 # can be removed once AnyEvent::DNS is proven stable.
857 if ($host eq "gameserver.deliantra.net") { 857 if ($host eq "gameserver.deliantra.net") {
858 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 858 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
859 if ($_[0] ne "80.101.114.108") { # Perl 859 if ($_[0] ne "80.101.114.108") { # P-e-r-l
860 status "dns failure, trying differently"; 860 status "dns failure, trying differently";
861 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" }; 861 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
862 unless (defined $host) { 862 unless (defined $host) {
863 status "dns failure, using hardcoded address"; 863 status "dns failure, using hardcoded address";
864 $host = "129.13.162.95"; 864 $host = "194.126.175.154";
865 } 865 }
866 } 866 }
867 867
868 dc_connect $host, $port; 868 dc_connect $host, $port;
869 }; 869 };
1145 ]); 1145 ]);
1146 1146
1147 my $text = !$freq 1147 my $text = !$freq
1148 ? "audio is off" 1148 ? "audio is off"
1149 : "audio is enabled\n" 1149 : "audio is enabled\n"
1150 . "driver: " . DC::SDL_AudioDriverName . "\n"
1150 . "frequency (Hz): $freq\n" 1151 . "frequency (Hz): $freq\n"
1151 . "channels: $chans\n" 1152 . "channels: $chans\n"
1152 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n" 1153 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1153 . "music decoders available: " . (join ", ", DC::MixMusic::decoders); 1154 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1154 1155
1155 $AUDIO_INFO->set_text ($text); 1156 $AUDIO_INFO->set_text ($text);
1156} 1157}
1157 1158
1158sub audio_setup { 1159sub audio_setup {
1342 $DELIANTRA_DEBUG ^= $_[0]; 1343 $DELIANTRA_DEBUG ^= $_[0];
1343 1344
1344 if ($DELIANTRA_DEBUG & 16) { 1345 if ($DELIANTRA_DEBUG & 16) {
1345 $BW_WATCHER = EV::periodic 0, 1, 0, sub { 1346 $BW_WATCHER = EV::periodic 0, 1, 0, sub {
1346 return unless $CONN; 1347 return unless $CONN;
1347 debug sprintf "%.2gKB/s", $CONN->{octets_in} / 1e3; 1348 debug sprintf "%8.2gKB/s", $CONN->{octets_in} / 1e3;
1348 $CONN->{octets_in} = 0; 1349 $CONN->{octets_in} = 0;
1349 }; 1350 };
1350 } else { 1351 } else {
1351 undef $BW_WATCHER; 1352 undef $BW_WATCHER;
1352 } 1353 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines