--- deliantra/Deliantra-Client/DC/MapWidget.pm	2008/08/30 08:04:01	1.142
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2008/12/19 22:16:18	1.146
@@ -13,7 +13,7 @@
 our @ISA = DC::UI::Base::;
 
 my $magicmap_tex =
-      new_from_file DC::Texture DC::find_rcfile "magicmap.png",
+      new_from_resource DC::Texture "magicmap.png",
          mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
 
 sub new {
@@ -434,24 +434,26 @@
          # the minimum time for a single tile movement
          my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1);
 
+         $spd *= $self->{tilesize};
+
          # jump if "impossibly high" speed
          if (
             (max abs $self->{sdx}, abs $self->{sdy})
-            > $spd * $self->{tilesize} * $mintime * 1.1
+            > $spd * $mintime * 2.1
          ) {
-            #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d#
+            #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
             $self->{sdx} = $self->{sdy} = 0;
          } else {
-            $spd *= $self->{tilesize} * $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
+            $spd *= $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
 
             my $dx = $self->{sdx} < 0 ? -$spd : $spd;
             my $dy = $self->{sdy} < 0 ? -$spd : $spd;
 
             if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
             if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
-
-            $self->update;
          }
+
+         $self->update;
       }
    } else {
       $self->{sdx} = $self->{sdy} = 0;
@@ -518,7 +520,7 @@
                        $::CONN->{player}{tag},
                        -$self->{sdx}, -$self->{sdy});
 
-         #glTranslate -$self->{sdx}, -$self->{sdy}; # anchro fow at player
+         #glTranslate -$self->{sdx}, -$self->{sdy}; # anchor fow at player
          glScale $self->{tilesize}, $self->{tilesize};
 
          if (my $tex = $self->{fow_texture}) {
@@ -613,6 +615,8 @@
    if ($::MAP && $self->{texture_atime} < time) {
       my ($w, $h) = @$self{qw(w h)};
 
+      return unless $w && $h;
+
       my $sw = int $::WIDTH  / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
       my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;