bleh

1 files changed, 7 insertions, 15 deletions

diff --git a/include/texture.h b/include/texture.h
index 4f5e162..904eeae 100644
--- a/include/texture.h
+++ b/include/texture.h
@@ -1,8 +1,7 @@
-#ifndef __GLTEXTURE_H__
-#define __GLTEXTURE_H__
+#ifndef __TEXTURE_H__
+#define __TEXTURE_H__
 
 #include <SDL.h>
-#include <SDL_opengl.h>
 #include <Handle.h>
 #include <Exceptions.h>
 #include <generic.h>
@@ -10,29 +9,22 @@
 namespace mogltk {
     class texture : public Base {
       public:
-          texture(int = 256, int = 256, bool = false) throw (GeneralException);
-	  texture(Handle *, bool = false) throw (GeneralException);
+          texture(int = 256, int = 256) throw (GeneralException);
+	  texture(Handle *) throw (GeneralException);
 	  virtual ~texture();
 	SDL_Surface * GetSurface();
 	Uint32 * GetPixels();
 	static SDL_Surface * LoadNTEX(Handle * h) throw (GeneralException) ;
-	void Generate();
-	void Bind(bool = true);
-	GLuint GetWidth();
-	GLuint GetHeight();
-	static void Unbind(void);
-	void Taint(void);
+	Uint32 GetWidth();
+	Uint32 GetHeight();
       private:
-        GLuint width, height, tex;
-	bool texture_allocated;
+        Uint32 width, height;
 	SDL_Surface * surface;
-	bool planar, tainted;
 #ifdef TRACE_TEXTURES
 	static texture * header;
 	static texture * footer;
 	texture * next, * prev;
 #endif
-	static texture * active;
     };
 };