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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.215 by root, Fri Aug 17 21:18:01 2007 UTC vs.
Revision 1.221 by root, Wed Aug 22 21:14:06 2007 UTC

          $channel->set_position_r ($dx, $dy, 20);
          $chunk->play ($channel);
       }
    } else {
       # sound_meta not set means data is in flight either way
-      my $meta = $CONN->{sound_meta}{$face}
+      my $meta = $CONN->{face}[$face]
          or return;
+      $meta->{data}
+         or return;
       # if its a jingle, play it as ambient music
-      if ($meta->{meta}{jingle}) {
+      if ($meta->{data}{jingle}) {
          if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
             push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
             &audio_music_push ($face);
          }
       } else {
          # fetch from database
          CFPlus::DB::get res_data => $meta->{name}, sub {
             my $rwops = new CFPlus::RW $_[0];
             my $chunk = new CFPlus::MixChunk $rwops
                or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
-            $chunk->volume (($meta->{meta}{volume} || 1) * 128);
+            $chunk->volume (($meta->{data}{volume} || 1) * 128);
             $AUDIO_CHUNK{$face} = $chunk;
             audio_sound_push ($face);
          };
       }
 sub audio_music_set_meta {
    my ($meta) = @_;
    $MUSIC_PLAYING_META = $meta;
    $MUSIC_PLAYING_WIDGET->set_markup (
-      "<b>Name</b>:	" . (CFPlus::asxml $meta->{meta}{name}) . "\n"
+      "<b>Name</b>:	" . (CFPlus::asxml $meta->{data}{name}) . "\n"
-    . "<b>Author</b>:	" . (CFPlus::asxml $meta->{meta}{author}) . "\n"
+    . "<b>Author</b>:	" . (CFPlus::asxml $meta->{data}{author}) . "\n"
-    . "<b>Source</b>:	" . (CFPlus::asxml $meta->{meta}{source}) . "\n"
+    . "<b>Source</b>:	" . (CFPlus::asxml $meta->{data}{source}) . "\n"
-    . "<b>License</b>:	" . (CFPlus::asxml $meta->{meta}{license})
+    . "<b>License</b>:	" . (CFPlus::asxml $meta->{data}{license})
    );
 }
 sub audio_music_update_volume {
    return unless $MUSIC_PLAYING_META;
-   my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
+   my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
-   my $base   = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
+   my $base   = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
    CFPlus::MixMusic::volume $base * $volume * 128;
 }
 sub audio_music_start {
    my $meta = $MUSIC_PLAYING_META;
       $fade_out = 333;
    } else {
       return unless $CFG->{bgm_enable};
       my @have =
-         grep $_,
+         grep $_ && $_->{data},
-            map $CONN->{music_meta}{$_},
+            map $CONN->{face}[$_],
                @$MUSIC_WANT;
       @MUSIC_HAVE = @have
          if @have;
       on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
    );
    $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
    $table->add_at (1, $row++, new CFPlus::UI::CheckBox
-      state => $CFG->{opengl11},
+      state => $CFG->{force_opengl11},
       tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
                . "higher memory usage and slower performance. It will, however, help tremendously on "
                . "cards that claim to support a feature but fall back to software rendering. "
                . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
                . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
                . "experience extremely low framerates and your card should do better, try this option.</b>",
-      on_changed => sub { my ($self, $value) = @_; $CFG->{opengl11} = $value; 0 }
+      on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
+   );
+   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
+   $table->add_at (1, $row++, new CFPlus::UI::CheckBox
+      state => $CFG->{texture_compression},
+      tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
+               . "will save a lot of memory and increase performance. The compression algorithm "
+               . "can differ form card to card, so your mileage may vary. This setting is ignored in "
+               . "forced OpenGL 1.1 mode.",
+      on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
    );
    $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
    $table->add_at (1, $row++, new CFPlus::UI::CheckBox
       state => $CFG->{fast},
       expand => 1, state => $CFG->{bgm_enable},
       tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
       on_changed => sub {
          $CFG->{bgm_enable} = $_[1];
          $CONN->update_fx_want if $CONN;
+         audio_music_push;
          0
       }
    );
    $table->add_at (2, $row++, new CFPlus::UI::Slider
       expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
    $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
    $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
    $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
    $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
-   $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
+   $vbox->add (my $exp    = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
+   $vbox->add (my $prg    = new CFPlus::UI::ExperienceProgress);
+   $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
-   $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
+   $vbox->add (my $rng    = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
    $GAUGES = {
+      exp => $exp, prg => $prg, sklprg => $sklprg,
-      exp => $exp, win => $win, range => $rng,
+      win => $win, range => $rng,
-      food => $fg, mana => $mg, hp => $hg, grace => $gg
+      hp => $hg, mana => $mg, grace => $gg, food => $fg,
    };
    &set_gauge_window_fontsize;
    $win
    $r
 }
 sub skill_window {
    my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
-   $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
+   $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1,  0, 0, 1, .1]);
    $sw
 }
 sub formsep($) {
    scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
 }
 sub add_license {
    my ($meta) = @_;
-   $meta = $meta->{meta}
+   $meta = $meta->{data}
       or return;
    $meta->{license} || $meta->{author} || $meta->{source}
       or return;
    CFPlus::DB::Server::run;
    CFPlus::UI::set_layout ($::CFG->{layout});
    my %DEF_CFG = (
-      sdl_mode        => 0,
+      sdl_mode            => 0,
-      fullscreen      => 0,
+      fullscreen          => 0,
-      fast            => 0,
+      fast                => 0,
-      opengl11        => 0,
+      force_opengl11      => undef,
+      texture_compression => 1,
-      map_scale       => 1,
+      map_scale           => 1,
-      fow_enable      => 1,
+      fow_enable          => 1,
-      fow_intensity   => 0,
+      fow_intensity       => 0,
-      map_smoothing   => 1,
+      map_smoothing       => 1,
-      gui_fontsize    => 1,
+      gui_fontsize        => 1,
-      log_fontsize    => 0.7,
+      log_fontsize        => 0.7,
-      gauge_fontsize  => 1,
+      gauge_fontsize      => 1,
-      gauge_size      => 0.35,
+      gauge_size          => 0.35,
-      stat_fontsize   => 0.7,
+      stat_fontsize       => 0.7,
-      mapsize         => 100,
+      mapsize             => 100,
-      audio_enable    => 1,
+      audio_enable        => 1,
-      effects_enable  => 1,
+      effects_enable      => 1,
-      effects_volume  => 1,
+      effects_volume      => 1,
-      bgm_enable      => 1,
+      bgm_enable          => 1,
-      bgm_volume      => 0.5,
+      bgm_volume          => 0.5,
-      output_sync     => 1,
+      output_sync         => 1,
-      output_count    => 1,
+      output_count        => 1,
-      output_rate     => "",
+      output_rate         => "",
-      pickup          => 0,
+      pickup              => 0,
-      inv_sort        => "mtime",
+      inv_sort            => "mtime",
-      default         => "profile", # default profile
+      default             => "profile", # default profile
-      show_tips       => 1,
+      show_tips           => 1,
-      logview_max_par => 1000,
+      logview_max_par     => 1000,
    );
    while (my ($k, $v) = each %DEF_CFG) {
       $CFG->{$k} = $v unless exists $CFG->{$k};
    }

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.215 by root, Fri Aug 17 21:18:01 2007 UTC vs. Revision 1.221 by root, Wed Aug 22 21:14:06 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.215 by root, Fri Aug 17 21:18:01 2007 UTC vs.
Revision 1.221 by root, Wed Aug 22 21:14:06 2007 UTC