--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/15 19:35:20	1.115
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/15 23:25:00	1.118
@@ -76,7 +76,7 @@
 
    my $rem = 0;
 
-   for ($vals) {
+   for (@$vals) {
       my $i = int $_ + $rem;
       $rem += $_ - $i;
       $_ = $i;
@@ -114,8 +114,8 @@
 
 sub move {
    my ($self, $x, $y, $z) = @_;
-   $self->{x} = $x;
-   $self->{y} = $y;
+   $self->{x} = int $x;
+   $self->{y} = int $y;
    $self->{z} = $z if defined $z;
 }
 
@@ -567,7 +567,7 @@
    $class->SUPER::new (
       bg        => [1, 1, 1, 1],
       border_bg => [1, 1, 1, 1],
-      border    => $::FONTSIZE * 0.8,
+      border    => int $::FONTSIZE * 0.8,
       @_
    )
 }
@@ -952,6 +952,7 @@
       fontsize => $::FONTSIZE,
       text     => "",
       align    => -1,
+      valign   => -1,
       padding  => 2,
       layout   => new CFClient::Layout,
       %arg
@@ -1038,7 +1039,12 @@
     : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
     :                      ($self->{w} - $tex->{w}) * 0.5;
 
-   $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
+   my $y =
+      $self->{valign} < 0 ? $self->{padding}
+    : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
+    :                       ($self->{h} - $tex->{h}) * 0.5;
+
+   $tex->draw_quad (int $x, int $y);
 
    glDisable GL_TEXTURE_2D;
    glDisable GL_BLEND;
@@ -1063,6 +1069,7 @@
       active_fg => [0, 0, 0],
       can_hover => 1,
       can_focus => 1,
+      valign    => 0,
       @_
    )
 }
@@ -1776,7 +1783,7 @@
                glEnable GL_CONVOLUTION_2D;
             }
 
-            my $tex = new CFClient::Texture
+            $self->{fow_texture} = new CFClient::Texture
                w              => $w,
                h              => $h,
                data           => $data,
@@ -1791,7 +1798,7 @@
             glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
 
             glColor +($::CFG->{fow_intensity}) x 3, 1;
-            $tex->draw_quad (0, 0, $w * 32, $h * 32);
+            $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
 
             glDisable GL_TEXTURE_2D;
             glDisable GL_BLEND;
@@ -1807,12 +1814,14 @@
            glEnable GL_TEXTURE_2D;
            glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
 
-           CFClient::Texture->new (
-                                 w    => $w,
-                                 h    => $h,
-                                 data => $::MAP->mapmap ($w, $h),
-                                 type => GL_UNSIGNED_INT_8_8_8_8_REV
-                              )->draw_quad (100, 100);
+           $self->{mapmap_texture} =
+              new CFClient::Texture
+                 w    => $w,
+                 h    => $h,
+                 data => $::MAP->mapmap ($w, $h),
+                 type => GL_UNSIGNED_INT_8_8_8_8_REV;
+
+           $self->{mapmap_texture}->draw_quad (100, 100);
 
            glDisable GL_TEXTURE_2D;
            glDisable GL_BLEND;
@@ -2018,7 +2027,7 @@
 
    $self->SUPER::add ($widget);
 
-   $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
+   $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
 }
 
 sub on_refresh {