[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.191 by root, Sun Jul 29 21:31:48 2007 UTC vs.
Revision 1.194 by root, Tue Jul 31 00:50:04 2007 UTC

 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;
 our $DEBUG_STATUS;
    $SETUP_DIALOG->show;
    $PL_WINDOW->hide;
    $SPELL_LIST->clear_spells;
    $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
-   &audio_music_set ([]);
+   &audio_music_set_ambient ([]);
    return unless $CONN;
    status "connection closed";
             text => $CFG->{profile}{default}{host},
             tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
             on_changed => sub {
                my ($self, $value) = @_;
                $CFG->{profile}{default}{host} = $value;
-               0
+               1
             }
       );
       $vbox->add (new CFPlus::UI::Button
          expand  => 1,
          text    => "Server List",
          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 },
       );
    }
    $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
    $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");
    $table->add_at (1, 5, new CFPlus::UI::Entry
       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");
    $table->add_at (1, 7, new CFPlus::UI::Slider
       force_w => 100,
       range => [$CFG->{mapsize}, 10, 100, 0, 1],
       tooltip => "This is the size of the portion of the map update the server sends you. "
                . "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 => "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 "
+      tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
-               . "when sending images, to ensure interactiveness. When 0 or unset, the server "
+               . "when sending data. When 0 or unset, the server "
-               . "default will be used, which is usually around 100kb/s.",
+               . "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]; 0 },
+      on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
    );
    $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, 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, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
       expand => 1,
       align => 0,
       text => "Login",
       on_activate => sub {
          $CONN ? stop_game
                : start_game;
-         0
+         1
       },
    );
    $vbox->add (new CFPlus::UI::FancyFrame
       label => "Server Info",
    if (my $chunk = $AUDIO_CHUNK{$face}) {
       for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
          my (undef, $dx, $dy, $vol) = @$_;
-         my $channel = $chunk->play
+         my $channel = CFPlus::Channel::find;
-            or return;
          $channel->volume (128 + $vol);
          $dx = $dx / 10 * 255;
          $channel->set_panning ((min 255, 255 - $dx), (min 255, 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 $vol = $meta->{meta}{volume} || 100;
+         my $vol = $meta->{meta}{volume} || 1;
          my $rwops = new CFPlus::RW $_[0];
          my $chunk = new CFPlus::MixChunk $rwops;
-         $chunk->volume ($vol * 128 / 100);
+         $chunk->volume ($vol * 128);
          $AUDIO_CHUNK{$face} = $chunk;
          audio_sound_push ($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_set {
+sub audio_music_set_ambient {
    my ($songs) = @_;
    my @want =
       grep $_,
          map $CONN->{music_meta}{$_},
 sub audio_shutdown {
    CFPlus::Mix_CloseAudio if $SDL_MIXER;
    undef $SDL_MIXER;
    @SOUNDS = ();
-   %AUDIO_CHUNKS = ();
+   %AUDIO_CHUNK = ();
 }
 my %animate_object;
 my $animate_timer;
 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;
    CFPlus::UI::set_layout ($::CFG->{layout});
    my %DEF_CFG = (
       sdl_mode        => 0,
-      width           => 640,
-      height          => 480,
       fullscreen      => 0,
       fast            => 0,
       map_scale       => 1,
       fow_enable      => 1,
       fow_intensity   => 0,

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.191 by root, Sun Jul 29 21:31:48 2007 UTC vs. Revision 1.194 by root, Tue Jul 31 00:50:04 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.191 by root, Sun Jul 29 21:31:48 2007 UTC vs.
Revision 1.194 by root, Tue Jul 31 00:50:04 2007 UTC