ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.137 by root, Sun Jul 20 03:46:02 2008 UTC vs.
Revision 1.139 by root, Sun Jul 20 15:05:13 2008 UTC

458 if (delete $self->{need_update}) { 458 if (delete $self->{need_update}) {
459 $self->movement_update; 459 $self->movement_update;
460 460
461 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; 461 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
462 462
463 my $sdx_t = DC::ceil $self->{sdx} / $tilesize; 463 my $sdx_t = DC::ceilabs $self->{sdx} / $tilesize;
464 my $sdy_t = DC::ceil $self->{sdy} / $tilesize; 464 my $sdy_t = DC::ceilabs $self->{sdy} / $tilesize;
465 465
466 # width/height of map, in tiles 466 # width/height of map, in tiles
467 my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize; 467 my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
468 my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize; 468 my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
469 469
470 # the map displacement, in tiles 470 # the map displacement, in tiles
471 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t; 471 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
472 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t; 472 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
473 473
477 477
478 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx; 478 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
479 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy; 479 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
480 480
481 if ($::CFG->{fow_enable}) { 481 if ($::CFG->{fow_enable}) {
482 $sdx_t = $sdy_t = 0;#d#
482 my ($w, $h, $data) = $::MAP->fow_texture ( 483 my ($w, $h, $data) = $::MAP->fow_texture (
483 $dx + (min 0, $sdx_t), 484 $dx + (min 0, $sdx_t),
484 $dy + (min 0, $sdy_t), 485 $dy + (min 0, $sdy_t),
485 $sw + abs $sdx_t, 486 $sw + abs $sdx_t,
486 $sh + abs $sdy_t 487 $sh + abs $sdy_t
506 $::MAP->draw ($dx, $dy, $sw, $sh, 507 $::MAP->draw ($dx, $dy, $sw, $sh,
507 $self->{tilesize}, 508 $self->{tilesize},
508 $::CONN->{player}{tag}, 509 $::CONN->{player}{tag},
509 -$self->{sdx}, -$self->{sdy}); 510 -$self->{sdx}, -$self->{sdy});
510 511
511 glTranslate -$self->{sdx}, -$self->{sdy}; 512 #glTranslate -$self->{sdx}, -$self->{sdy}; # anchro fow at player
512 glScale $self->{tilesize}, $self->{tilesize}; 513 glScale $self->{tilesize}, $self->{tilesize};
513 514
514 if (my $tex = $self->{fow_texture}) { 515 if (my $tex = $self->{fow_texture}) {
515 glPushMatrix; 516 glPushMatrix;
516 glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); 517 glTranslate +(min 0, $sdx_t), (min 0, $sdy_t);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines