--- deliantra/Deliantra-Client/DC.pm	2006/04/21 07:09:10	1.42
+++ deliantra/Deliantra-Client/DC.pm	2006/04/21 07:19:56	1.43
@@ -21,6 +21,7 @@
    XSLoader::load "CFClient", $VERSION;
 }
 
+use Carp ();
 use AnyEvent;
 use BerkeleyDB;
 use CFClient::OpenGL;
@@ -257,7 +258,7 @@
       $tw = topot $tw;
       $th = topot $th;
 
-      if ($tw != $self->{w} || $th != $self->{h} && defined $data) {
+      if (($tw != $self->{w} || $th != $self->{h}) && defined $data) {
          my $bpp = (length $data) / ($self->{w} * $self->{h});
          $data = pack "(a" . ($tw * $bpp) . ")*",
                     unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
@@ -295,7 +296,7 @@
                    $self->{type},
                    $data;
       if (my $error = glGetError) {
-         warn sprintf "texture upload error: %x %dx%d i=%x f=%x t=%x\n",
+         Carp::cluck sprintf "texture upload error: %x %dx%d i=%x f=%x t=%x",
                       $error, $tw, $th, $self->{internalformat},  $self->{format}, $self->{type};
       }
    } else {
@@ -304,7 +305,10 @@
                    0, 0,
                    $tw, $th,
                    0;
-      glGetError and die "glCopyTexImage2D $tw,$th";
+      if (my $error = glGetError) {
+         Carp::cluck sprintf "texture upload error: %x %dx%d i=%x",
+                      $error, $tw, $th, $self->{internalformat};
+      }
    }
 }