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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.211 by root, Sun Aug 12 01:49:25 2007 UTC vs.
Revision 1.219 by root, Tue Aug 21 00:59:34 2007 UTC

 our $STATUSBOX;
 our $DEBUG_STATUS;
 our $INV;
 our $INVR;
-our $INV_RIGHT_HB;
+our $INVR_HB;
-our $PICKUP_CFG;
 #############################################################################
 sub status {
    $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
          $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);
          };
       }
       or return;
    $CFG->{effects_enable}
       or return;
    my $queue = $AUDIO_PLAY{$face} ||= [];
-   push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
+   push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events
    audio_sound_push $face
       unless @$queue > 1;
 }
 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],
    $sw1->add ($INV = new CFPlus::UI::Inventory);
    $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
    $hb->add (my $vb2 = new CFPlus::UI::VBox);
-   $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
+   $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
    $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
    $sw2->add ($INVR = new CFPlus::UI::Inventory);
    # XXX: Call after $INVR = ... because set_opencont sets the items
 }
 sub add_license {
    my ($meta) = @_;
-   $meta = $meta->{meta}
+   $meta = $meta->{data}
       or return;
    $meta->{license} || $meta->{author} || $meta->{source}
       or return;
          on_activate => sub { $QUIT_DIALOG->hide; 0 },
       );
       $hb->add (new CFPlus::UI::Button
          text => "Quit anyway",
          expand => 1,
-         on_activate => sub { exit },
+         on_activate => sub { Event::unloop_all },
       );
    }
    $QUIT_DIALOG->show;
    $QUIT_DIALOG->grab_focus;
          tooltip     => "Terminates the program",
          on_activate => sub {
             if ($CONN) {
                open_quit_dialog;
             } else {
-               exit;
+               Event::unloop_all;
             }
             0
          },
       );
       $BUTTONBAR->show;
       $SETUP_DIALOG->show;
+      $MESSAGE_WINDOW->show;
    }
    $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
 }
    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};
    }
 }
 show_tip_of_the_day if $CFG->{show_tips};
 Event::loop;
+#video_shutdown;
+#audio_shutdown;
-#CFPlus::SDL_Quit;
+CFPlus::SDL_Quit;
-#CFPlus::_exit 0;
-END {
-   video_shutdown;
-   audio_shutdown;
-   CFPlus::SDL_Quit;
-   CFPlus::DB::Server::stop;
+CFPlus::DB::Server::stop;
-}
 =head1 NAME
 cfplus - A Crossfire TRT and Crossfire game client

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.211 by root, Sun Aug 12 01:49:25 2007 UTC vs. Revision 1.219 by root, Tue Aug 21 00:59:34 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.211 by root, Sun Aug 12 01:49:25 2007 UTC vs.
Revision 1.219 by root, Tue Aug 21 00:59:34 2007 UTC