X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FText.cpp;h=8f9b1524ef99757edea61e64fc2f5713c8819ea8;hb=b17ec650f79ea8efbfda00ae93bd82434fcea686;hp=4c22f0fd973e08b0a85e47298fc0ab1bfa47ea95;hpb=46cff1de1e828cb8c04a5dc5377bc07baae57858;p=lugaru.git

diff --git a/Source/Text.cpp b/Source/Text.cpp
index 4c22f0f..8f9b152 100644
--- a/Source/Text.cpp
+++ b/Source/Text.cpp
@@ -32,7 +32,7 @@ void Text::LoadFontTexture(const char *fileName)
 
 	LOG(std::string("Loading font texture...") + fileName);
 
-	Game::LoadTexture(fileName, &FontTexture, false, false);
+	FontTexture.load(fileName, false, false);
 /*
 	//Load Image
 	//LoadTGA( fileName ); 
@@ -86,7 +86,7 @@ void Text::BuildFont()								// Build Our Font Display List
 
 //	base=glGenLists(256);								// Creating 256 Display Lists
 	base=glGenLists(512);								// Creating 256 Display Lists
-	glBindTexture(GL_TEXTURE_2D, FontTexture);			// Select Our Font Texture
+	FontTexture.bind();
 	for (loop=0; loop<512; loop++)						// Loop Through All 256 Lists
 	{
 		if (loop < 256)
@@ -130,7 +130,7 @@ void Text::_glPrint(float x, float y, const char *string, int set, float size, f
 		set=1;
 	}
 	glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
-	glBindTexture(GL_TEXTURE_2D, FontTexture);			// Select Our Font Texture
+	FontTexture.bind();
 	glDisable(GL_DEPTH_TEST);							// Disables Depth Testing
 	glDisable(GL_LIGHTING);
 	glEnable(GL_BLEND);
@@ -181,18 +181,14 @@ void Text::glPrintOutlined(float r, float g, float b, float x, float y, const ch
 	glPrint( x,  y, string,  set,  size,  width,  height);
 }
 
-Text::Text()
-{
+Text::Text() {
 	base = 0;
-	FontTexture = 0;
 }
-Text::~Text()
-{
-	if (base)
-	{
+Text::~Text() {
+	if (base) {
 		glDeleteLists(base, 512);
 		base = 0;
 	}
-	if (FontTexture) glDeleteTextures( 1, &FontTexture );
+	FontTexture.destroy();
 }