--- deliantra/Deliantra-Client/DC/MapWidget.pm	2006/06/15 08:29:18	1.60
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2006/06/15 15:33:58	1.61
@@ -9,6 +9,10 @@
 
 our @ISA = CFClient::UI::Base::;
 
+my $magicmap_tex =
+      new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png",
+         mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
+
 sub new {
    my $class = shift;
 
@@ -246,6 +250,17 @@
    $res
 }
 
+sub set_magicmap {
+   my ($self, $w, $h, $x, $y, $data) = @_;
+
+   $x += - $::MAP->x - int 0.5 * $::MAP->w;
+   $y += - $::MAP->y - int 0.5 * $::MAP->h;
+
+   $self->{magicmap} = [$x, $y, $w, $h, $data];
+
+   $self->update;
+}
+
 sub draw {
    my ($self) = @_;
 
@@ -266,8 +281,8 @@
       my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
       my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
 
-      my $sw = $self->{sw} = 1 + CFClient::ceil $::WIDTH  / $tilesize;
-      my $sh = $self->{sh} = 1 + CFClient::ceil $::HEIGHT / $tilesize;
+      my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
+      my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
 
       if ($::CFG->{fow_enable}) {
          my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
@@ -304,25 +319,34 @@
 
       $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
 
+      glScale 32, 32;
+
       if (my $tex = $self->{fow_texture}) {
          glEnable GL_TEXTURE_2D;
          glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
 
-         glScale 32, 32;
          glColor +($::CFG->{fow_intensity}) x 3, 0.9;
          $self->{fow_texture}->draw_quad_alpha (0, 0);
 
          glDisable GL_TEXTURE_2D;
       }
 
-      glPopMatrix;
+      if ($self->{magicmap}) {
+         my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
+
+         $x += $::MAP->x - $sx + int 0.5 * ($::MAP->w - $sw + 1);
+         $y += $::MAP->y - $sy + int 0.5 * ($::MAP->h - $sh + 1);
 
+         glTranslate - $x - 1, - $y - 1;
+         glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
+         $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
+      }
+
+      glPopMatrix;
       glEndList;
    }
 
-   glPushMatrix;
    glCallList $self->{list};
-   glPopMatrix;
 
    # TNT2 emulates logops in software (or worse :)
    unless ($focused) {