--- deliantra/Deliantra-Client/bin/cfplus 2007/07/22 17:17:17 1.183
+++ deliantra/Deliantra-Client/bin/cfplus 2007/07/31 02:03:13 1.196
@@ -73,6 +73,7 @@
use Time::HiRes 'time';
use Event;
+use List::Util qw(max min);
use Crossfire;
use Crossfire::Protocol::Constants;
@@ -162,13 +163,15 @@
our $SDL_MIXER;
our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
-our @MUSIC_WANT;
+our $MUSIC_WANT; # arryref of ambient music
+our @MUSIC_HAVE; # ambient music we want now
our $MUSIC_START;
-our $MUSIC_PLAYING;
+our $MUSIC_PLAYING_DATA;
+our $MUSIC_PLAYING_META;
our $MUSIC_PLAYER;
our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
our @SOUNDS; # event => file mapping
-our %AUDIO_CHUNKS; # audio files
+our %AUDIO_CHUNK; # audio files
our $ALT_ENTER_MESSAGE;
our $STATUSBOX;
@@ -180,8 +183,170 @@
our $PICKUP_CFG;
-our $IN_BUILD_MODE;
-our $BUILD_BUTTON;
+#############################################################################
+#TODO: maybe move into own audio module...
+
+sub audio_channel_finished {
+ my ($channel) = @_;
+
+# warn "channel $channel finished\n";#d#
+}
+
+our %AUDIO_PLAY;
+our %AUDIO_CHUNK;
+
+sub audio_sound_push($) {
+ my ($face) = @_;
+
+ if (my $chunk = $AUDIO_CHUNK{$face}) {
+ for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
+ my (undef, $dx, $dy, $vol) = @$_;
+
+ my $channel = CFPlus::Channel::find;
+ $channel->volume ($vol * 128 / 255);
+ $dx = $dx / 10 * 255;
+ $channel->set_panning (255 - $dx, 255 + $dx);
+
+# my $angle = $dx ? : $dx < 0 ?
+# my $distance = -$vol;
+# $channel->set_position ($angle, $distance);
+
+ $chunk->play ($channel);
+ }
+ } else {
+ # sound_meta not set means data is in flight either way
+ my $meta = $CONN->{sound_meta}{$face}
+ or return;
+
+ # fetch from database
+ CFPlus::DB::get res_data => $meta->{name}, sub {
+ my $rwops = new CFPlus::RW $_[0];
+ my $chunk = new CFPlus::MixChunk $rwops;
+ $chunk->volume (($meta->{meta}{volume} || 1) * 128);
+ $AUDIO_CHUNK{$face} = $chunk;
+
+ audio_sound_push ($face);
+ };
+ }
+}
+
+sub audio_sound_play {
+ my ($face, $dx, $dy, $vol) = @_;
+
+ $SDL_MIXER
+ or return;
+
+ my $queue = $AUDIO_PLAY{$face} ||= [];
+ push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
+ audio_sound_push $face
+ unless @$queue > 1;
+}
+
+sub audio_music_update_volume {
+ return unless $MUSIC_PLAYING_META;
+ my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
+ my $base = $CFG->{bgm_volume};
+ CFPlus::MixMusic::volume $base * $volume * 128;
+}
+
+sub audio_music_push {
+ my @have =
+ grep $_,
+ map $CONN->{music_meta}{$_},
+ @$MUSIC_WANT;
+
+ if (@have) {
+ @MUSIC_HAVE = @have;
+ &audio_music_changed ();
+ }
+}
+
+sub audio_music_set_ambient {
+ my ($songs) = @_;
+
+ $MUSIC_WANT = $songs;
+
+ audio_music_push;
+}
+
+sub audio_music_start {
+ my $meta = $MUSIC_PLAYING_META;
+
+ CFPlus::DB::get res_data => $meta->{name}, sub {
+ return unless $SDL_MIXER;
+
+ # music might have changed...
+ $meta eq $MUSIC_PLAYING_META
+ or return &audio_music_start ();
+
+ audio_music_update_volume;
+
+ $MUSIC_PLAYING_DATA = \$_[0];
+
+ my $rwops = $meta->{path}
+ ? new_from_file CFPlus::RW $meta->{path}
+ : new CFPlus::RW $$MUSIC_PLAYING_DATA;
+
+ $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
+ or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
+
+ my $NOW = time;
+
+ if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
+ my $pos = $MUSIC_PLAYING_META->{stop_pos};
+ $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
+ $MUSIC_START = time - $pos;
+ } else {
+ $MUSIC_PLAYER->play (0);
+ $MUSIC_START = time;
+ }
+
+ delete $MUSIC_PLAYING_META->{stop_time};
+ delete $MUSIC_PLAYING_META->{stop_pos};
+ }
+}
+
+sub audio_music_changed {
+ return unless $CFG->{bgm_enable};
+ return unless $SDL_MIXER;
+
+ # default MUSIC_HAVE == MUSIC_DEFAULT
+ @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
+
+ # if the currently playing song is acceptable, let it continue
+ return if $MUSIC_PLAYING_META
+ && grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
+
+ my $NOW = time;
+
+ if ($MUSIC_PLAYING_META) {
+ $MUSIC_PLAYING_META->{stop_time} = $NOW;
+ $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
+ CFPlus::MixMusic::fade_out 1000;
+ } else {
+ # sort by stop time, oldest first
+ @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
+
+ # if the most recently-played piece played very recently,
+ # resume it, else choose the oldest piece for rotation.
+ $MUSIC_PLAYING_META =
+ $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
+ ? $MUSIC_HAVE[-1]
+ : $MUSIC_HAVE[0];
+
+ audio_music_start;
+ }
+}
+
+sub audio_music_finished {
+ undef $MUSIC_PLAYER;
+ undef $MUSIC_PLAYING_META;
+ undef $MUSIC_PLAYING_DATA;
+
+ audio_music_changed;
+}
+
+#############################################################################
sub status {
$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
@@ -464,18 +629,6 @@
setup_req => {
smoothing => $CFG->{map_smoothing}*1,
},
-
- sound_play => sub {
- my ($x, $y, $soundnum, $type) = @_;
-
- $SDL_MIXER
- or return;
-
- my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
- or return;
-
- $chunk->play;
- },
};
if ($CONN) {
@@ -496,7 +649,7 @@
$SPELL_LIST->clear_spells;
$CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
- &audio_music_set ([]);
+ &audio_music_set_ambient ([]);
return unless $CONN;
@@ -663,7 +816,7 @@
$hbox->add (new CFPlus::UI::Slider
expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
tooltip => "The volume of the background music. Changes are instant.",
- on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
+ on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
);
$table->add_at (1, $row++, new CFPlus::UI::Button
@@ -1086,7 +1239,7 @@
on_changed => sub {
my ($self, $value) = @_;
$CFG->{profile}{default}{host} = $value;
- 0
+ 1
}
);
@@ -1096,7 +1249,7 @@
other => $METASERVER,
tooltip => "Show a list of available crossfire servers",
on_activate => sub { $METASERVER->toggle_visibility; 0 },
- on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
+ on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
);
}
@@ -1104,7 +1257,7 @@
$table->add_at (1, 4, new CFPlus::UI::Entry
text => $CFG->{profile}{default}{user},
tooltip => "The name of your character on the server",
- on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
+ on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
);
$table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
@@ -1112,7 +1265,7 @@
text => $CFG->{profile}{default}{password},
hidden => 1,
tooltip => "The password for your character",
- on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
+ on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
);
$table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
@@ -1123,53 +1276,41 @@
. "If you set this to a high value you will be able to see further, "
. "but you also increase bandwidth requirements and latency. "
. "This option is only used once at log-in.",
- on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
+ on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
);
- $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
- $table->add_at (1, 8, new CFPlus::UI::CheckBox
- state => $CFG->{face_prefetch},
- tooltip => "Background Image Prefetch\n\n"
- . "If enabled, the client automatically pre-fetches images from the server. "
- . "This might increase or create lag, but increases the chances "
- . "of faces being ready for display when you encounter them. "
- . "It also uses up server bandwidth on every connect, "
- . "so only set it if you really need to prefetch images. "
- . "This option can be set and unset any time.",
- on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
- );
-
- $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
- $table->add_at (1, 9, new CFPlus::UI::Entry
+ $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
+ $table->add_at (1, 8, new CFPlus::UI::Entry
text => $CFG->{output_rate},
- tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
- . "when sending images, to ensure interactiveness. When 0 or unset, the server "
- . "default will be used, which is usually around 100kb/s.",
- on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
+ tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
+ . "when sending data. When 0 or unset, the server "
+ . "default will be used, which is usually around 100kb/s. Most servers will "
+ . "dynamically find an optimal rate, so adjust this only when necessary.",
+ on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
);
- $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
- $table->add_at (1, 10, new CFPlus::UI::Entry
+ $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
+ $table->add_at (1, 9, new CFPlus::UI::Entry
text => $CFG->{output_count},
tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
- on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
+ on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
);
- $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
- $table->add_at (1, 11, new CFPlus::UI::Entry
+ $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
+ $table->add_at (1, 10, new CFPlus::UI::Entry
text => $CFG->{output_sync},
tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
- on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
+ on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
);
- $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
+ $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
expand => 1,
align => 0,
text => "Login",
on_activate => sub {
$CONN ? stop_game
: start_game;
- 0
+ 1
},
);
@@ -1186,19 +1327,6 @@
my $row = 0;
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
- $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
- text => $CFG->{say_command},
- tooltip => "This is the command that will be used if you write a line in the message window entry or press \" in the map window. "
- . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
- . "But you could also set it to tell playername to only chat with that user.",
- on_changed => sub {
- my ($self, $value) = @_;
- $CFG->{say_command} = $value;
- 0
- }
- );
-
$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
$table->add_at (1, $row++, new CFPlus::UI::CheckBox
state => $CFG->{show_tips},
@@ -1419,27 +1547,27 @@
$PL_NOTEBOOK =
new CFPlus::UI::Notebook expand => 1;
- $ntb->add (
+ $ntb->add_tab (
"Statistics (F2)" => $STATS_PAGE = stats_window,
"Shows statistics, where all your Stats and Resistances are shown."
);
- $ntb->add (
+ $ntb->add_tab (
"Skills (F3)" => $SKILL_PAGE = skill_window,
"Shows all your Skills."
);
my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
- $ntb->add (
+ $ntb->add_tab (
"Spellbook (F4)" => $spellsw,
"Displays all spells you have and lets you edit keyboard shortcuts for them."
);
- $ntb->add (
+ $ntb->add_tab (
"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
"Toggles the inventory window, where you can manage your loot (or treasures :). "
. "You can also hit the Tab-key to show/hide the Inventory."
);
- $ntb->add (Pickup => autopickup_setup,
+ $ntb->add_tab (Pickup => autopickup_setup,
"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
$ntb->set_current_page ($INVENTORY_PAGE);
@@ -1755,22 +1883,22 @@
$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
- $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
+ $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
"Configure the server to play on, your username, password and other server-related options.");
- $SETUP_NOTEBOOK->add (Client => client_setup,
+ $SETUP_NOTEBOOK->add_tab (Client => client_setup,
"Configure various client-specific settings.");
- $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
+ $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
"Configure the video mode, performance, fonts and other graphical aspects of the game.");
- $SETUP_NOTEBOOK->add (Audio => audio_setup,
+ $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
"Configure the use of audio, sound effects and background music.");
- $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
+ $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
"Lets you define, edit and delete key bindings."
. "There is a shortcut for making bindings: Control-Insert opens the binding editor "
. "with nothing set and the recording started. After doing the actions you "
. "want to record press Insert and you will be asked to press a key-combo. "
. "After pressing the combo the binding will be saved automatically and the "
. "binding editor closes");
- $SETUP_NOTEBOOK->add (Debug => debug_setup,
+ $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
"Some debuggin' options. Do not ask.");
$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
@@ -1821,252 +1949,25 @@
$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
}
-sub setup_build_button {
- my ($enabled) = @_;
- if ($enabled) {
- $BUILD_BUTTON->hide if $BUILD_BUTTON;
- $BUILD_BUTTON ||= new CFPlus::UI::Button
- text => "Build",
- tooltip => "Opens the ingame builder",
- on_activate => sub {
- if ($CONN) {
- $CONN->send_ext_req (builder_player_items => sub {
- open_ingame_editor ($_[0]) if exists $_[0]->{items};
- });
- }
- 0
- };
- $BUTTONBAR->add ($BUILD_BUTTON);
- } else {
- $BUILD_BUTTON->hide if $BUILD_BUTTON;
- }
-}
-
-sub open_ingame_editor {
- my ($msg) = @_;
-
- my $win = new CFPlus::UI::Toplevel
- x => 0,
- y => 'center',
- z => 4,
- name => 'builder_window',
- force_w => int $WIDTH * 1/4,
- force_h => int $HEIGHT * 3/4,
- title => "In game builder",
- has_close_button => 1;
-
- my $r = new CFPlus::UI::ScrolledWindow (
- expand => 1,
- scroll_y => 1
- );
- $r->add (my $vb = new CFPlus::UI::VBox);
- $win->add ($r);
-
-
- $vb->add (
- new CFPlus::UI::Button
- text => "Disable build mode",
- on_activate => sub { $::IN_BUILD_MODE = undef }
- );
- $vb->add (
- new CFPlus::UI::Button
- text => "ERASE",
- on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
- );
-
- for my $itemarchname (
- sort {
- $msg->{items}->{$a}->{build_arch_name}
- cmp $msg->{items}->{$b}->{build_arch_name}
- } keys %{$msg->{items}}
- ) {
- my $info = $msg->{items}->{$itemarchname};
- $vb->add (
- new CFPlus::UI::Button text => $info->{build_arch_name},
- on_activate => sub {
- $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
-
- if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
- build_mode_query_arch_info ();
- }
- }
- );
- }
-
- $win->show;
-}
-
-sub build_mode_query_arch_info {
- my ($iteminfo) = $::IN_BUILD_MODE;
- my $itemarchname = $iteminfo->{item};
- my $info = $iteminfo->{info};
-
- my $dialog = new CFPlus::UI::Toplevel
- x => "center",
- y => "center",
- z => 50,
- force_w => int $WIDTH * 1/2,
- title => "Enter information for placement of '$itemarchname'",
- has_close_button => 1;
-
- $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
-
- $vb->add (my $table = new CFPlus::UI::Table expand => 1);
- my $row = 0;
- if ($info->{has_name}) {
- $table->add_at (0, $row, new CFPlus::UI::Label text => "Name:");
- $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
- }
- if ($info->{has_text}) {
- $table->add_at (0, $row, new CFPlus::UI::Label text => "Text:");
- $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
- }
- if ($info->{has_connection}) {
- $table->add_at (0, $row, new CFPlus::UI::Label text => "Connection ID:");
- $table->add_at (1, $row++,
- new CFPlus::UI::Entry
- expand => 1,
- on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
- tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
- );
- }
-
- $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
- $hb->add (new CFPlus::UI::Button
- text => "Close",
- expand => 1,
- on_activate => sub { $dialog->hide; 0 },
- );
- $dialog->show;
-}
-
sub video_shutdown {
CFPlus::OpenGL::shutdown;
undef $SDL_ACTIVE;
}
-sub audio_channel_finished {
- my ($channel) = @_;
-
- #warn "channel $channel finished\n";#d#
-}
-
-sub audio_music_set {
- my ($songs) = @_;
-
- my @want =
- grep $_,
- map $CONN->{music_meta}{$_},
- @$songs;
-
- if (@want) {
- @MUSIC_WANT = @want;
- &audio_music_changed ();
- }
-}
-
-sub audio_music_start {
- my $path = $MUSIC_PLAYING->{path}
- or return;
-
- CFPlus::DB::prefetch_file $path, 1024_000, sub {
- return unless $SDL_MIXER;
-
- # music might have changed...
- $path eq $MUSIC_PLAYING->{path}
- or return &audio_music_start ();
-
- $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
-
- my $NOW = time;
-
- if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
- my $pos = $MUSIC_PLAYING->{stop_pos};
- $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
- $MUSIC_START = time - $pos;
- } else {
- $MUSIC_PLAYER->play (0);
- $MUSIC_START = time;
- }
-
- delete $MUSIC_PLAYING->{stop_time};
- delete $MUSIC_PLAYING->{stop_pos};
- }
-}
-
-sub audio_music_changed {
- return unless $CFG->{bgm_enable};
- return unless $SDL_MIXER;
-
- # default MUSIC_WANT == MUSIC_DEFAULT
- @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
-
- # if the currently playing song is acceptable, let it continue
- return if $MUSIC_PLAYING
- && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
-
- my $NOW = time;
-
- if ($MUSIC_PLAYING) {
- $MUSIC_PLAYING->{stop_time} = $NOW;
- $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
- CFPlus::MixMusic::fade_out 1000;
- } else {
- # sort by stop time, oldest first
- @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
-
- # if the most recently-played piece played very recently,
- # resume it, else choose the oldest piece for rotation.
- $MUSIC_PLAYING =
- $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
- ? $MUSIC_WANT[-1]
- : $MUSIC_WANT[0];
-
- audio_music_start;
- }
-}
-
-sub audio_music_finished {
- $MUSIC_PLAYING = undef;
- undef $MUSIC_PLAYER;
-
- audio_music_changed;
-}
-
sub audio_init {
if ($CFG->{audio_enable}) {
- if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
- $SDL_MIXER = !CFPlus::Mix_OpenAudio;
+ $ENV{MIX_EFFECTSMAXSPEED} = 1;
+ $SDL_MIXER = !CFPlus::Mix_OpenAudio;
- unless ($SDL_MIXER) {
- status "Unable to open sound device: there will be no sound";
- return;
- }
-
- CFPlus::Mix_AllocateChannels 8;
- CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
+ unless ($SDL_MIXER) {
+ status "Unable to open sound device: there will be no sound";
+ return;
+ }
- audio_music_finished;
+ CFPlus::Mix_AllocateChannels 16;
- local $_;
- while (<$fh>) {
- next if /^\s*#/;
- next if /^\s*$/;
-
- my ($file, $volume, $event) = split /\s+/, $_, 3;
-
- push @SOUNDS, "$volume,$file";
-
- $AUDIO_CHUNKS{"$volume,$file"} ||= do {
- my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
- $chunk->volume ($volume * 128 / 100);
- $chunk
- };
- }
- } else {
- status "unable to open sound config: $!";
- }
+ audio_music_finished;
} else {
undef $SDL_MIXER;
}
@@ -2076,7 +1977,7 @@
CFPlus::Mix_CloseAudio if $SDL_MIXER;
undef $SDL_MIXER;
@SOUNDS = ();
- %AUDIO_CHUNKS = ();
+ %AUDIO_CHUNK = ();
}
my %animate_object;
@@ -2084,8 +1985,6 @@
my $fps = 9;
-my %demo;#d#
-
sub force_refresh {
$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
@@ -2127,15 +2026,6 @@
delete $animate_object{$widget};
}
-# check once/second for faces that need to be prefetched
-# this should, of course, only run on demand, but
-# SDL forces worse things on us....
-
-Event->timer (after => 1, interval => 0.25, cb => sub {
- $CONN->face_prefetch
- if $CONN;
-});
-
%SDL_CB = (
CFPlus::SDL_QUIT => sub {
exit;
@@ -2188,8 +2078,6 @@
my %DEF_CFG = (
sdl_mode => 0,
- width => 640,
- height => 480,
fullscreen => 0,
fast => 0,
map_scale => 1,
@@ -2202,11 +2090,9 @@
gauge_size => 0.35,
stat_fontsize => 0.7,
mapsize => 100,
- say_command => 'chat',
audio_enable => 1,
bgm_enable => 1,
bgm_volume => 0.25,
- face_prefetch => 0,
output_sync => 1,
output_count => 1,
output_rate => "",