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.133 by root, Sat Jul 19 20:33:47 2008 UTC vs.
Revision 1.134 by root, Sat Jul 19 20:40:53 2008 UTC

433 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d# 433 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d#
434 $self->{sdx} = $self->{sdy} = 0; 434 $self->{sdx} = $self->{sdy} = 0;
435 } else { 435 } else {
436 my $upd = 0; 436 my $upd = 0;
437 437
438 $spd *= $self->{tilesize} * $diff * 1.0001; 438 $spd *= $self->{tilesize} * $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
439 439
440 my $dx = $self->{sdx} < 0 ? -$spd : $spd; 440 my $dx = $self->{sdx} < 0 ? -$spd : $spd;
441 my $dy = $self->{sdy} < 0 ? -$spd : $spd; 441 my $dy = $self->{sdy} < 0 ? -$spd : $spd;
442 442
443 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx; $upd = 1 } 443 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx; $upd = 1 }
491 } 491 }
492 492
493 glNewList ($self->{list} ||= glGenList); 493 glNewList ($self->{list} ||= glGenList);
494 494
495 glPushMatrix; 495 glPushMatrix;
496 glTranslate $sx0 + $self->{sdx}, $sy0 + $self->{sdy}; 496 glTranslate $sx0, $sy0;
497 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 497 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
498 glTranslate $self->{sdx}, $self->{sdy};
498 499
499 $::MAP->draw ($dx, $dy, $sw, $sh, 500 $::MAP->draw ($dx, $dy, $sw, $sh,
500 $self->{tilesize}, 501 $self->{tilesize},
501 $::CONN->{player}{tag}, 502 $::CONN->{player}{tag},
502 -$self->{sdx}, -$self->{sdy}); 503 -$self->{sdx}, -$self->{sdy});

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines