--- deliantra/Deliantra-Client/DC/MapWidget.pm	2007/04/01 15:09:45	1.103
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2007/04/04 02:43:29	1.104
@@ -12,8 +12,6 @@
 
 our @ISA = CFPlus::UI::Base::;
 
-sub ::T() { 32 }
-
 my $magicmap_tex =
       new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
          mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
@@ -25,6 +23,7 @@
       z         => -1,
       can_focus => 1,
       list      => glGenList,
+      tilesize  => 32,
 
       smooth_matrix => [
          0.05, 0.13, 0.05,
@@ -43,6 +42,12 @@
    $self
 }
 
+sub set_tilesize {
+   my ($self, $tilesize) = @_;
+
+   $self->{tilesize} = $tilesize;
+}
+
 sub add_command {
    my ($self, $command, $tooltip, $widget, $cb) = @_;
 
@@ -289,9 +294,11 @@
 }
 
 sub size_request {
+   my ($self) = @_;
+
    (
-      ::T * CFPlus::ceil $::WIDTH  / ::T,
-      ::T * CFPlus::ceil $::HEIGHT / ::T,
+      $self->{tilesize} * CFPlus::ceil $::WIDTH  / $self->{tilesize},
+      $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
    )
 }
 
@@ -449,7 +456,7 @@
       unless $focused || !$::FAST;
 
    if (delete $self->{need_update}) {
-      my $tilesize = $self->{tilesize} = int ::T * $::CFG->{map_scale};
+      my $tilesize = $self->{tilesize} = int $self->{tilesize} * $::CFG->{map_scale};
 
       my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
       my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
@@ -496,9 +503,9 @@
       glTranslate $sx0, $sy0;
       glScale $::CFG->{map_scale}, $::CFG->{map_scale};
 
-      $::MAP->draw ($dx, $dy, $sw, $sh, ::T);
+      $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
 
-      glScale ::T, ::T;
+      glScale $self->{tilesize}, $self->{tilesize};
 
       if (my $tex = $self->{fow_texture}) {
          glEnable GL_TEXTURE_2D;
@@ -583,11 +590,11 @@
 
    my ($w, $h) = @$self{qw(w h)};
 
-   my $sw = int $::WIDTH  / (::T * $::CFG->{map_scale}) + 0.99;
-   my $sh = int $::HEIGHT / (::T * $::CFG->{map_scale}) + 0.99;
+   my $sw = int $::WIDTH  / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
+   my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
 
-   my $sx = int $::CFG->{map_shift_x} / ::T;
-   my $sy = int $::CFG->{map_shift_y} / ::T;
+   my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
+   my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
 
    my $ox = 0.5 * ($w - $sw);
    my $oy = 0.5 * ($h - $sh);