X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGraphic%2FText.cpp;h=1253ba9d474f73eb56ac487f80310b024bf05aa8;hb=1a6ef830cdd01a9b7a8bbcfde8a51b7c430671a3;hp=31bbe9f9ea9a7007afee14a87e26acca2581dc61;hpb=b84825978803615f45a9f128232e62431042aec0;p=lugaru.git

diff --git a/Source/Graphic/Text.cpp b/Source/Graphic/Text.cpp
index 31bbe9f..1253ba9 100644
--- a/Source/Graphic/Text.cpp
+++ b/Source/Graphic/Text.cpp
@@ -18,9 +18,9 @@ You should have received a copy of the GNU General Public License
 along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/**> HEADER FILES <**/
-#include "Graphic/Text.h"
-#include "Game.h"
+#include "Graphic/Text.hpp"
+
+#include "Game.hpp"
 
 void Text::LoadFontTexture(const std::string& fileName)
 {
@@ -77,12 +77,7 @@ void Text::BuildFont() // Build Our Font Display List
     } // Loop Until All 256 Are Built
 }
 
-void Text::glPrint(float x, float y, const char *string, int set, float size, float width, float height) // Where The Printing Happens
-{
-    glPrint(x, y, string, set, size, width, height, 0, strlen(string));
-}
-
-void Text::_glPrint(float x, float y, const char *string, int set, float size, float width, float height, int start, int end, int offset) // Where The Printing Happens
+void Text::_glPrint(float x, float y, const std::string& string, int set, float size, float width, float height, int start, int end, int offset) // Where The Printing Happens
 {
     if (set > 1) {
         set = 1;
@@ -112,43 +107,45 @@ void Text::_glPrint(float x, float y, const char *string, int set, float size, f
     glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
 }
 
-void Text::glPrint(float x, float y, const char *string, int set, float size, float width, float height, int start, int end) // Where The Printing Happens
+void Text::glPrint(float x, float y, const std::string& string, int set, float size, float width, float height, int start, int end)
 {
+    if (end < 0) {
+        end = string.size();
+    }
     _glPrint(x, y, string, set, size, width, height, start, end, 0);
 }
 
-void Text::glPrintOutline(float x, float y, const char *string, int set, float size, float width, float height) // Where The Printing Happens
-{
-    glPrintOutline(x, y, string, set, size, width, height, 0, strlen(string));
-}
-
-void Text::glPrintOutline(float x, float y, const char *string, int set, float size, float width, float height, int start, int end) // Where The Printing Happens
+void Text::glPrintOutline(float x, float y, const std::string& string, int set, float size, float width, float height, int start, int end)
 {
+    if (end < 0) {
+        end = string.size();
+    }
     _glPrint(x, y, string, set, size, width, height, start, end, 256);
 }
-void Text::glPrintOutlined(float x, float y, const char *string, int set, float size, float width, float height) // Where The Printing Happens
+
+void Text::glPrintOutlined(float x, float y, const std::string& string, int set, float size, float width, float height, int start, int end)
 {
-    glPrintOutlined(1, 1, 1, x, y, string, set, size, width, height);
+    glPrintOutlined(1, 1, 1, 1, x, y, string, set, size, width, height, start, end);
 }
 
-void Text::glPrintOutlined(float r, float g, float b, float x, float y, const char *string, int set, float size, float width, float height) // Where The Printing Happens
+void Text::glPrintOutlined(float r, float g, float b, float a, float x, float y, const std::string& string, int set, float size, float width, float height, int start, int end)
 {
-    glColor4f(0, 0, 0, 1);
-    glPrintOutline( x - 2 * size,  y - 2 * size, string,  set,  size * 2.5 / 2,  width,  height);
-    glColor4f(r, g, b, 1);
-    glPrint( x,  y, string,  set,  size,  width,  height);
+    glColor4f(0, 0, 0, a);
+    glPrintOutline( x - 2 * size,  y - 2 * size, string,  set,  size * 2.5 / 2,  width,  height, start, end);
+    glColor4f(r, g, b, a);
+    glPrint( x,  y, string,  set,  size,  width,  height, start, end);
 }
 
 Text::Text()
 {
     base = 0;
 }
+
 Text::~Text()
 {
     if (base) {
         glDeleteLists(base, 512);
         base = 0;
     }
-    FontTexture.destroy();
 }