--- deliantra/Deliantra-Client/bin/cfplus	2007/08/19 14:09:28	1.217
+++ deliantra/Deliantra-Client/bin/cfplus	2007/08/26 03:12:34	1.222
@@ -230,11 +230,14 @@
       }
    } 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);
@@ -245,7 +248,7 @@
             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);
@@ -273,17 +276,17 @@
 
    $MUSIC_PLAYING_META = $meta;
    $MUSIC_PLAYING_WIDGET->set_markup (
-      "<b>Name</b>:	" . (CFPlus::asxml $meta->{meta}{name}) . "\n"
-    . "<b>Author</b>:	" . (CFPlus::asxml $meta->{meta}{author}) . "\n"
-    . "<b>Source</b>:	" . (CFPlus::asxml $meta->{meta}{source}) . "\n"
-    . "<b>License</b>:	" . (CFPlus::asxml $meta->{meta}{license})
+      "<b>Name</b>:	" . (CFPlus::asxml $meta->{data}{name}) . "\n"
+    . "<b>Author</b>:	" . (CFPlus::asxml $meta->{data}{author}) . "\n"
+    . "<b>Source</b>:	" . (CFPlus::asxml $meta->{data}{source}) . "\n"
+    . "<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 $base   = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
+   my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
+   my $base   = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
    CFPlus::MixMusic::volume $base * $volume * 128;
 }
 
@@ -336,8 +339,8 @@
       return unless $CFG->{bgm_enable};
 
       my @have =
-         grep $_,
-            map $CONN->{music_meta}{$_},
+         grep $_ && $_->{data},
+            map $CONN->{face}[$_],
                @$MUSIC_WANT;
 
       @MUSIC_HAVE = @have
@@ -786,7 +789,8 @@
       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.",
+               . "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 }
    );
 
@@ -919,6 +923,7 @@
       on_changed => sub {
          $CFG->{bgm_enable} = $_[1];
          $CONN->update_fx_want if $CONN;
+         audio_music_push;
          0
       }
    );
@@ -981,12 +986,15 @@
    $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 $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
+   $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");
 
    $GAUGES = {
-      exp => $exp, win => $win, range => $rng,
-      food => $fg, mana => $mg, hp => $hg, grace => $gg
+      exp => $exp, prg => $prg, sklprg => $sklprg,
+      win => $win, range => $rng,
+      hp => $hg, mana => $mg, grace => $gg, food => $fg,
    };
 
    &set_gauge_window_fontsize;
@@ -1197,7 +1205,9 @@
 
 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
 }
 
@@ -1652,7 +1662,7 @@
 sub add_license {
    my ($meta) = @_;
 
-   $meta = $meta->{meta}
+   $meta = $meta->{data}
       or return;
 
    $meta->{license} || $meta->{author} || $meta->{source}
@@ -2151,7 +2161,7 @@
 
 %SDL_CB = (
    CFPlus::SDL_QUIT => sub {
-      exit;
+      Event::unloop_all;
    },
    CFPlus::SDL_VIDEORESIZE => sub {
    },
@@ -2294,14 +2304,17 @@
 #      warn $t2-$t1;
 #   }
 
-   $startup_done->();
-
    video_init;
    audio_init;
 }
 
 show_tip_of_the_day if $CFG->{show_tips};
 
+Event->idle (cb => sub {
+   $_[0]->w->cancel;
+   $startup_done->();
+});
+
 Event::loop;
 
 #video_shutdown;