ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.192 by root, Mon Jul 30 02:16:16 2007 UTC vs.
Revision 1.194 by root, Tue Jul 31 00:50:04 2007 UTC

… …
168our $MUSIC_PLAYING_DATA; 168our $MUSIC_PLAYING_DATA;
169our $MUSIC_PLAYING_META; 169our $MUSIC_PLAYING_META;
170our $MUSIC_PLAYER; 170our $MUSIC_PLAYER;
171our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before 171our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
172our @SOUNDS; # event => file mapping 172our @SOUNDS; # event => file mapping
173our %AUDIO_CHUNKS; # audio files 173our %AUDIO_CHUNK; # audio files
174 174
175our $ALT_ENTER_MESSAGE; 175our $ALT_ENTER_MESSAGE;
176our $STATUSBOX; 176our $STATUSBOX;
177our $DEBUG_STATUS; 177our $DEBUG_STATUS;
178 178
… …
481 $SETUP_DIALOG->show; 481 $SETUP_DIALOG->show;
482 $PL_WINDOW->hide; 482 $PL_WINDOW->hide;
483 $SPELL_LIST->clear_spells; 483 $SPELL_LIST->clear_spells;
484 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 484 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
485 485
486 &audio_music_set ([]); 486 &audio_music_set_ambient ([]);
487 487
488 return unless $CONN; 488 return unless $CONN;
489 489
490 status "connection closed"; 490 status "connection closed";
491 491
… …
1803 1803
1804 if (my $chunk = $AUDIO_CHUNK{$face}) { 1804 if (my $chunk = $AUDIO_CHUNK{$face}) {
1805 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) { 1805 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
1806 my (undef, $dx, $dy, $vol) = @$_; 1806 my (undef, $dx, $dy, $vol) = @$_;
1807 1807
1808 my $channel = $chunk->play 1808 my $channel = CFPlus::Channel::find;
1809 or return;
1810
1811 $channel->volume (128 + $vol); 1809 $channel->volume (128 + $vol);
1812 $dx = $dx / 10 * 255; 1810 $dx = $dx / 10 * 255;
1813 $channel->set_panning ((min 255, 255 - $dx), (min 255, 255 + $dx)); 1811 $channel->set_panning ((min 255, 255 - $dx), (min 255, 255 + $dx));
1812
1814# my $angle = $dx ? : $dx < 0 ? 1813# my $angle = $dx ? : $dx < 0 ?
1815# my $distance = -$vol; 1814# my $distance = -$vol;
1816# $channel->set_position ($angle, $distance); 1815# $channel->set_position ($angle, $distance);
1816
1817 $chunk->play ($channel);
1817 } 1818 }
1818 } else { 1819 } else {
1819 # sound_meta not set means data is in flight either way 1820 # sound_meta not set means data is in flight either way
1820 my $meta = $CONN->{sound_meta}{$face} 1821 my $meta = $CONN->{sound_meta}{$face}
1821 or return; 1822 or return;
1822 1823
1823 # fetch from database 1824 # fetch from database
1824 CFPlus::DB::get res_data => $meta->{name}, sub { 1825 CFPlus::DB::get res_data => $meta->{name}, sub {
1825 my $vol = $meta->{meta}{volume} || 100; 1826 my $vol = $meta->{meta}{volume} || 1;
1826 my $rwops = new CFPlus::RW $_[0]; 1827 my $rwops = new CFPlus::RW $_[0];
1827 my $chunk = new CFPlus::MixChunk $rwops; 1828 my $chunk = new CFPlus::MixChunk $rwops;
1828 $chunk->volume ($vol * 128 / 100); 1829 $chunk->volume ($vol * 128);
1829 $AUDIO_CHUNK{$face} = $chunk; 1830 $AUDIO_CHUNK{$face} = $chunk;
1830 1831
1831 audio_sound_push ($face); 1832 audio_sound_push ($face);
1832 }; 1833 };
1833 } 1834 }
… …
1843 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s 1844 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
1844 audio_sound_push $face 1845 audio_sound_push $face
1845 unless @$queue > 1; 1846 unless @$queue > 1;
1846} 1847}
1847 1848
1848sub audio_music_set { 1849sub audio_music_set_ambient {
1849 my ($songs) = @_; 1850 my ($songs) = @_;
1850 1851
1851 my @want = 1852 my @want =
1852 grep $_, 1853 grep $_,
1853 map $CONN->{music_meta}{$_}, 1854 map $CONN->{music_meta}{$_},
… …
1955 1956
1956sub audio_shutdown { 1957sub audio_shutdown {
1957 CFPlus::Mix_CloseAudio if $SDL_MIXER; 1958 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1958 undef $SDL_MIXER; 1959 undef $SDL_MIXER;
1959 @SOUNDS = (); 1960 @SOUNDS = ();
1960 %AUDIO_CHUNKS = (); 1961 %AUDIO_CHUNK = ();
1961} 1962}
1962 1963
1963my %animate_object; 1964my %animate_object;
1964my $animate_timer; 1965my $animate_timer;
1965 1966
1966my $fps = 9; 1967my $fps = 9;
1967
1968my %demo;#d#
1969 1968
1970sub force_refresh { 1969sub force_refresh {
1971 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1970 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1972 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 1971 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1973 1972
… …
2058 2057
2059 CFPlus::UI::set_layout ($::CFG->{layout}); 2058 CFPlus::UI::set_layout ($::CFG->{layout});
2060 2059
2061 my %DEF_CFG = ( 2060 my %DEF_CFG = (
2062 sdl_mode => 0, 2061 sdl_mode => 0,
2063 width => 640,
2064 height => 480,
2065 fullscreen => 0, 2062 fullscreen => 0,
2066 fast => 0, 2063 fast => 0,
2067 map_scale => 1, 2064 map_scale => 1,
2068 fow_enable => 1, 2065 fow_enable => 1,
2069 fow_intensity => 0, 2066 fow_intensity => 0,

Diff Legend

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