--- deliantra/Deliantra-Client/DC/Protocol.pm	2007/08/06 05:06:33	1.146
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2007/08/12 09:39:49	1.151
@@ -59,11 +59,7 @@
       my (%cap) = @_;
 
       #$self->send ("setup sound 0"); # we use a different protocol
-
-      $self->send_exti_msg (fx_want => {
-         3 => !!$::CFG->{bgm_enable},   # FT_MUSIC
-         5 => !!$::CFG->{audio_enable}, # FT_SOUND
-      });
+      $self->update_fx_want;
 
       if (my $ts = $cap{tileset}) {
          if (my ($default) = grep $_->[2] & 1, @$ts) {
@@ -225,6 +221,15 @@
    $self
 }
 
+sub update_fx_want {
+   my ($self) = @_;
+
+   $self->send_exti_msg (fx_want => {
+      3 => !!$::CFG->{bgm_enable},   # FT_MUSIC
+      5 => !!$::CFG->{audio_enable}, # FT_SOUND
+   });
+}
+
 sub logprint {
    my ($self, @a) = @_;
 
@@ -503,8 +508,36 @@
 sub feed_map1a {
    my ($self, $data) = @_;
 
-   $self->{map}->map1a_update ($data, $self->{setup}{extmap});
-   $self->{map_widget}->update;
+   my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
+   my $delay;
+
+   for my $tile (@$missing) {
+      next if $self->{delay}{$tile};
+
+      $delay = 1;
+
+      if (my $tex = $::CONN->{texture}[$tile]) {
+         $tex->upload;
+      } else {
+         $self->{delay}{$tile} = 1;
+
+         # we assume the face is in-flight and will eventually come
+         push @{$self->{face_cb}{$tile}}, sub {
+            delete $self->{delay}{$tile};
+            $_[0]->upload;
+         };
+      }
+   }
+
+   if ($delay) {
+      # delay the map drawing a tiny bit in the hope of getting the missing fetched
+      Event->timer (after => 0.03, cb => sub {
+         $_[0]->w->cancel;
+         $self->{map_widget}->update;
+      });
+   } else {
+      $self->{map_widget}->update;
+   }
 }
 
 sub magicmap {
@@ -551,8 +584,10 @@
 
       return unless $self->{map}; # stop when destroyed
 
-      $self->have_tile ($id)
-         if $exists;
+      if ($exists) {
+         $self->have_tile ($id);
+         $self->{texture}[$id]->upload;
+      }
 
       $self->bg_fetch;
    };
@@ -718,7 +753,6 @@
       CFPlus::DB::get tilecache => $id, $cb;
 
    } elsif ($face->{type} & 1) { # with metadata
-      #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
       CFPlus::DB::get res_meta => $face->{name}, $cb;
    }
 }
@@ -733,43 +767,34 @@
       $self->have_tile ($face->{id});
 
    } elsif ($face->{type} & 1) { # split metadata
-      my $cb = sub { };
+      if ($changed) { # new data
+         my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
+         $face->{meta} = $self->{json_coder}->decode ($meta_json);
+
+         CFPlus::DB::put res_data => $face->{name} => $data, sub { };
+         CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
+      } else {
+         $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
+      }
+
+      ::add_license ($face);
 
       if ($face->{type} == 3) { # FT_MUSIC
-         $cb = sub {
-            $self->{music_meta}{$facenum} = $face;
+         $self->{music_meta}{$facenum} = $face;
 
-            ::message ({ markup => "downloaded song #$facenum" })
-               if $changed;
+         ::message ({ markup => "downloaded song #$facenum" })
+            if $changed;
 
-            &::audio_music_push ($facenum);
-         };
+         &::audio_music_push ($facenum);
       } elsif ($face->{type} == 5) { # FT_SOUND
-         $cb = sub {
-            $self->{sound_meta}{$facenum} = $face;
+         $self->{sound_meta}{$facenum} = $face;
 
-            ::message ({ markup => "downloaded sound #$facenum" })
-               if $changed;
+         ::message ({ markup => "downloaded sound #$facenum" })
+            if $changed;
 
-            &::audio_sound_push ($facenum);
-         };
+         &::audio_sound_push ($facenum);
       }
 
-      if ($changed) { # new data
-         my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
-
-         CFPlus::DB::put res_data => $face->{name} => $data, sub { };
-         CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
-            $face->{meta} = $self->{json_coder}->decode ($meta_json);
-            ::add_license ($face);
-            $cb->();
-         };
-
-      } else {
-         $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
-            ::add_license ($face);
-         $cb->();
-      }
    }
 }
 
@@ -784,11 +809,11 @@
 
    return unless $self->{map};
 
-   $self->{texture}[$tile] ||= my $tex =
+   my $tex = $self->{texture}[$tile] ||=
       new CFPlus::Texture
          tile => $tile, minify => 1, mipmap => 1, delay => 1;
 
-   $_->() for @{(delete $self->{face_cb}{$tile}) || []};
+   $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
 }
 
 sub connect_face_update {
@@ -993,7 +1018,7 @@
       $::FLOORBOX->add_at (@add);
    });
 
-   $::WANT_REFRESH++;
+   $::WANT_REFRESH->start;
 }
 
 sub set_opencont {