--- deliantra/Deliantra-Client/DC/MapWidget.pm	2008/07/20 15:09:29	1.140
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2008/12/22 02:33:30	1.147
@@ -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 {
@@ -165,7 +165,7 @@
 
    if ($ev->{button} == 1) {
       $self->grab_focus;
-      return unless $::CONN;
+      return unless $::CONN && $self->{ctilesize};
 
       my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
       my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
@@ -287,24 +287,29 @@
 }
 
 my %DIR = (
-   ( "," . DC::SDLK_KP5  ), [0, "stay fire"],
-   ( "," . DC::SDLK_KP8  ), [1, "north"],
-   ( "," . DC::SDLK_KP9  ), [2, "northeast"],
-   ( "," . DC::SDLK_KP6  ), [3, "east"],
-   ( "," . DC::SDLK_KP3  ), [4, "southeast"],
-   ( "," . DC::SDLK_KP2  ), [5, "south"],
-   ( "," . DC::SDLK_KP1  ), [6, "southwest"],
-   ( "," . DC::SDLK_KP4  ), [7, "west"],
-   ( "," . DC::SDLK_KP7  ), [8, "northwest"],
-
-   ( "," . DC::SDLK_UP   ), [1, "north"],
-   ("1," . DC::SDLK_UP   ), [2, "northeast"],
-   ( "," . DC::SDLK_RIGHT), [3, "east"],
-   ("1," . DC::SDLK_RIGHT), [4, "southeast"],
-   ( "," . DC::SDLK_DOWN ), [5, "south"],
-   ("1," . DC::SDLK_DOWN ), [6, "southwest"],
-   ( "," . DC::SDLK_LEFT ), [7, "west"],
-   ("1," . DC::SDLK_LEFT ), [8, "northwest"],
+   ( "," . DC::SDLK_KP5      ), [0, "stay fire"],
+   ( "," . DC::SDLK_KP8      ), [1, "north"],
+   ( "," . DC::SDLK_KP9      ), [2, "northeast"],
+   ( "," . DC::SDLK_KP6      ), [3, "east"],
+   ( "," . DC::SDLK_KP3      ), [4, "southeast"],
+   ( "," . DC::SDLK_KP2      ), [5, "south"],
+   ( "," . DC::SDLK_KP1      ), [6, "southwest"],
+   ( "," . DC::SDLK_KP4      ), [7, "west"],
+   ( "," . DC::SDLK_KP7      ), [8, "northwest"],
+
+   ( "," . DC::SDLK_PAGEUP   ), [2, "northeast"],
+   ( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
+   ( "," . DC::SDLK_END      ), [6, "southwest"],
+   ( "," . DC::SDLK_HOME     ), [8, "northwest"],
+
+   ( "," . DC::SDLK_UP       ), [1, "north"],
+   ("1," . DC::SDLK_UP       ), [2, "northeast"],
+   ( "," . DC::SDLK_RIGHT    ), [3, "east"],
+   ("1," . DC::SDLK_RIGHT    ), [4, "southeast"],
+   ( "," . DC::SDLK_DOWN     ), [5, "south"],
+   ("1," . DC::SDLK_DOWN     ), [6, "southwest"],
+   ( "," . DC::SDLK_LEFT     ), [7, "west"],
+   ("1," . DC::SDLK_LEFT     ), [8, "northwest"],
 );
 
 sub invoke_key_down {
@@ -314,14 +319,16 @@
    my $sym = $ev->{sym};
    my $uni = $ev->{unicode};
 
-   $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_SHIFT;
+   $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT;
 
    # ignore repeated keypresses
    return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
    $self->{last_mod} = $mod;
    $self->{last_sym} = $sym;
 
-   if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) {
+   my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
+
+   if ($::CONN && $dir) {
       if ($mod & DC::KMOD_SHIFT) {
          $self->{shft}++;
          if ($dir->[0] != $self->{fire_dir}) {
@@ -358,7 +365,9 @@
          $res = 1;
       }
    } else {
-      if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) {
+      my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
+
+      if ($dir && delete $self->{shft}) {
          $::CONN->user_send ("fire_stop");
          delete $self->{fire_dir};
          $res = 1;
@@ -370,7 +379,7 @@
       }
    }
 
-   if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) {
+   if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
       $::CONN->user_send ("run_stop");
       $res = 1;
    }
@@ -423,26 +432,28 @@
          my $spd  = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
 
          # the minimum time for a single tile movement
-         my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK);
+         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;
@@ -509,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}) {
@@ -604,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;