--- deliantra/Deliantra-Client/DC/Protocol.pm	2007/07/31 02:03:13	1.143
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2007/08/10 04:02:13	1.148
@@ -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,26 +221,19 @@
    $self
 }
 
-sub logprint {
-   my ($self, @a) = @_;
-
-   $self->{log_fh} ||= do {
-      my $path = "$Crossfire::VARDIR/log.$self->{host}";
-
-      open my $fh, ">>:utf8", $path
-         or die "Couldn't open logfile $path: $!";
-
-      $fh->autoflush (1);
-
-      $fh;
-   };
+sub update_fx_want {
+   my ($self) = @_;
 
-   my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
+   $self->send_exti_msg (fx_want => {
+      3 => !!$::CFG->{bgm_enable},   # FT_MUSIC
+      5 => !!$::CFG->{audio_enable}, # FT_SOUND
+   });
+}
 
-   my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
-               $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
+sub logprint {
+   my ($self, @a) = @_;
 
-   print {$self->{log_fh}} "$ts ", @a, "\n";
+   CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
 }
 
 sub _stat_numdiff {
@@ -519,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 {
@@ -562,13 +579,13 @@
          or return;
    } while $self->{texture}[$id];
 
-   CFPlus::DB::get tilecache => $id, sub {
-      my ($data) = @_;
+   CFPlus::DB::exists tilecache => $id, sub {
+      my ($exists) = @_;
 
       return unless $self->{map}; # stop when destroyed
 
-      $self->set_texture ($id => $data)
-         if defined $data;
+      $self->have_tile ($id)
+         if $exists;
 
       $self->bg_fetch;
    };
@@ -734,7 +751,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;
    }
 }
@@ -746,44 +762,37 @@
       CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
          if $changed;
 
-      $self->set_texture ($face->{id} => delete $face->{data});
+      $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);
-            $cb->();
-         };
-
-      } else {
-         $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
-         $cb->();
-      }
    }
 }
 
@@ -793,19 +802,16 @@
    $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
 }
 
-sub set_texture {
-   my ($self, $id, $data) = @_;
+sub have_tile {
+   my ($self, $tile) = @_;
 
    return unless $self->{map};
 
-   $self->{texture}[$id] = my $tex =
-      new_from_image CFPlus::Texture
-         $data, minify => 1, mipmap => 1;
-
-   $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
-   $self->{map_widget}->update;
+   my $tex = $self->{texture}[$tile] ||=
+      new CFPlus::Texture
+         tile => $tile, minify => 1, mipmap => 1, delay => 1;
 
-   $_->() for @{(delete $self->{face_cb}{$id}) || []};
+   $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
 }
 
 sub connect_face_update {
@@ -1010,7 +1016,7 @@
       $::FLOORBOX->add_at (@add);
    });
 
-   $::WANT_REFRESH++;
+   $::WANT_REFRESH->start;
 }
 
 sub set_opencont {