X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FText.cpp;h=0a31c3ea6f9a165056820f72be43fada4583c620;hb=e08372a2095837a0b951ccb68c3499ef67c1a827;hp=06ff6cdcfb1efb9f47e814000aa48b83361b7092;hpb=25e3d5e35a7fd7efdffc420efe3c41a91cefe43f;p=lugaru.git

diff --git a/Source/Text.cpp b/Source/Text.cpp
index 06ff6cd..0a31c3e 100644
--- a/Source/Text.cpp
+++ b/Source/Text.cpp
@@ -1,66 +1,34 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
-Lugaru is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+Lugaru is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
+Lugaru is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
 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.
+along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /**> HEADER FILES <**/
 #include "Text.h"
 #include "Game.h"
-extern TGAImageRec texture;
 
-void Text::LoadFontTexture(const char *fileName)
+void Text::LoadFontTexture(const std::string& fileName)
 {
-    GLuint type;
-
     LOGFUNC;
 
     LOG(std::string("Loading font texture...") + fileName);
 
-    FontTexture.load(fileName, false, false);
-    /*
-        //Load Image
-        //LoadTGA( fileName );
-        unsigned char fileNamep[256];
-        CopyCStringToPascal(fileName,fileNamep);
-        //Load Image
-        upload_image( fileNamep ,1);
-
-        //Is it valid?
-        if(1==1){
-            //Alpha channel?
-            if ( texture.bpp == 24 )
-                type = GL_RGB;
-            else
-                type = GL_RGBA;
-
-            glPixelStorei( GL_UNPACK_ALIGNMENT, 1 );
-
-            if(!FontTexture)glGenTextures( 1, &FontTexture );
-            glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
-
-            glBindTexture( GL_TEXTURE_2D, FontTexture);
-            glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
-            glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
-
-            gluBuild2DMipmaps( GL_TEXTURE_2D, type, texture.sizeX, texture.sizeY, type, GL_UNSIGNED_BYTE, texture.data );
-        }
-    */
+    FontTexture.load(fileName, false);
     if (base) {
         glDeleteLists(base, 512);
         base = 0;
@@ -78,11 +46,8 @@ void Text::BuildFont() // Build Our Font Display List
     if (base) {
         glDeleteLists(base, 512);
         base = 0;
-        //LOG("Font already created...");
-        //return;
     }
 
-//base=glGenLists(256); // Creating 256 Display Lists
     base = glGenLists(512); // Creating 256 Display Lists
     FontTexture.bind();
     for (loop = 0; loop < 512; loop++) { // Loop Through All 256 Lists