X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fvideo%2Ftexture.cpp;h=8e792b814e3f1b6a9916182ed34b8d3dd91d82cc;hb=6b50afc6cdd8d3555901b02ce12f15b5bac32aa8;hp=98bfc91d3a5b33358879927a3033a76a0607871e;hpb=efc61e9d05b077f13a76982590fb0bd6a9d8dc61;p=supertux.git

diff --git a/src/video/texture.cpp b/src/video/texture.cpp
index 98bfc91d3..8e792b814 100644
--- a/src/video/texture.cpp
+++ b/src/video/texture.cpp
@@ -1,7 +1,7 @@
 //  $Id$
 //
-//  SuperTux -  A Jump'n Run
-//  Copyright (C) 2004 Matthias Braun <matze@braunis.de
+//  SuperTux
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -16,6 +16,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include <config.h>
 
 #include "texture.hpp"
@@ -96,12 +97,6 @@ Texture::~Texture()
   glDeleteTextures(1, &handle);
 }
 
-void upload_texture(SDL_Surface* , int , int , int , int , int , int )
-{
-  // TODO
-  assert(false);
-}
-
 void
 Texture::set_texture_params()
 {
@@ -109,7 +104,6 @@ Texture::set_texture_params()
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_R, GL_CLAMP);
 
   assert_gl("set texture params");
 }