--- deliantra/Deliantra-Client/DC/UI.pm 2006/07/23 08:58:44 1.332 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/07/23 16:11:12 1.334 @@ -1637,16 +1637,6 @@ $self } -sub escape($) { - local $_ = $_[0]; - - s/&/&/g; - s/>/>/g; - s/\n";#d# + + $self->{path} + or die "cannot serialise CFClient::UI::Image on non-loadable images\n"; + + $self->{path} +} + +sub STORABLE_attach { + my ($self, $cloning, $path) = @_; + warn "attach<@_>\n";#d# + + $self->new (path => $path) +} + sub size_request { my ($self) = @_; @@ -2228,7 +2236,7 @@ glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; - $tex->draw_quad_alpha (0, 0, $w, $h); + $tex->draw_quad (0, 0, $w, $h); glDisable GL_TEXTURE_2D; } @@ -2530,7 +2538,7 @@ my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; - $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1); + $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); ! ! $delta }