--- deliantra/Deliantra-Client/DC/MapWidget.pm 2007/01/02 14:45:22 1.100 +++ deliantra/Deliantra-Client/DC/MapWidget.pm 2007/04/01 15:08:14 1.102 @@ -12,6 +12,8 @@ our @ISA = CFPlus::UI::Base::; +sub ::T() { 64 } + my $magicmap_tex = new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", mipmap => 1, wrap => 0, internalformat => GL_ALPHA; @@ -288,8 +290,8 @@ sub size_request { ( - 32 * CFPlus::ceil $::WIDTH / 32, - 32 * CFPlus::ceil $::HEIGHT / 32, + ::T * CFPlus::ceil $::WIDTH / ::T, + ::T * CFPlus::ceil $::HEIGHT / ::T, ) } @@ -447,7 +449,7 @@ unless $focused || !$::FAST; if (delete $self->{need_update}) { - my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; + my $tilesize = $self->{tilesize} = int ::T * $::CFG->{map_scale}; my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; @@ -494,9 +496,9 @@ glTranslate $sx0, $sy0; glScale $::CFG->{map_scale}, $::CFG->{map_scale}; - $::MAP->draw ($dx, $dy, $sw, $sh); + $::MAP->draw ($dx, $dy, $sw, $sh, ::T); - glScale 32, 32; + glScale ::T, ::T; if (my $tex = $self->{fow_texture}) { glEnable GL_TEXTURE_2D; @@ -581,11 +583,11 @@ my ($w, $h) = @$self{qw(w h)}; - my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; - my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; + my $sw = int $::WIDTH / (::T * $::CFG->{map_scale}) + 0.99; + my $sh = int $::HEIGHT / (::T * $::CFG->{map_scale}) + 0.99; - my $sx = int $::CFG->{map_shift_x} / 32; - my $sy = int $::CFG->{map_shift_y} / 32; + my $sx = int $::CFG->{map_shift_x} / ::T; + my $sy = int $::CFG->{map_shift_y} / ::T; my $ox = 0.5 * ($w - $sw); my $oy = 0.5 * ($h - $sh);