--- deliantra/Deliantra-Client/DC/MapWidget.pm 2008/07/20 02:55:36 1.136 +++ deliantra/Deliantra-Client/DC/MapWidget.pm 2008/07/20 03:46:02 1.137 @@ -460,13 +460,16 @@ my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; + my $sdx_t = DC::ceil $self->{sdx} / $tilesize; + my $sdy_t = DC::ceil $self->{sdy} / $tilesize; + # width/height of map, in tiles my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize; my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize; # the map displacement, in tiles - my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $self->{sdx} / $self->{tilesize}; - my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $self->{sdy} / $self->{tilesize}; + my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t; + my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t; # the upper left "visible" corner, in pixels my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; @@ -476,7 +479,12 @@ my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy; if ($::CFG->{fow_enable}) { - my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); + my ($w, $h, $data) = $::MAP->fow_texture ( + $dx + (min 0, $sdx_t), + $dy + (min 0, $sdy_t), + $sw + abs $sdx_t, + $sh + abs $sdy_t + ); $self->{fow_texture} = new DC::Texture w => $w, @@ -505,6 +513,7 @@ if (my $tex = $self->{fow_texture}) { glPushMatrix; + glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); glScale 1/3, 1/3; glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;