handle line breaks in Font::DrawString

[l2e.git] / src / graphics / Font.cpp

diff --git a/src/graphics/Font.cpp b/src/graphics/Font.cpp
index efaad1525611302446f7fd9f46479bfd62f19637..94d451ae7a9f7d272cc706599c9ce4b5b774849d 100644 (file)
--- a/src/graphics/Font.cpp
+++ b/src/graphics/Font.cpp
@@ -7,6 +7,7 @@
 
 #include "Font.h"
 
+#include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
 
 #include <cmath>
@@ -14,6 +15,7 @@
 
 using geometry::Vector;
 using loader::FieldDescription;
+using loader::Interpreter;
 using loader::TypeDescription;
 using std::pow;
 
@@ -27,14 +29,37 @@ void Font::DrawChar(char c, SDL_Surface *dest, const Vector<int> &position) cons
        sprite->Draw(dest, position, col, row);
 }
 
-void Font::DrawString(const char *s, SDL_Surface *dest, const Vector<int> &positionIn, int maxChars) const {
+void Font::DrawString(const char *s, SDL_Surface *dest, const Vector<int> &positionIn, int maxWidth) const {
        if (!sprite) return;
 
        Vector<int> position(positionIn);
+       Vector<int> lineHead(positionIn);
        Vector<int> step(CharWidth(), 0);
-       for (int i(0); s[i] && (maxChars <= 0 || i < maxChars); ++i, position += step) {
-               DrawChar(s[i], dest, position);
+       Vector<int> lineBreak(0, CharHeight());
+       for (int i(0), col(0); s[i] && (maxWidth <= 0 || col < maxWidth); ++i) {
+               if (s[i] == '\n') {
+                       lineHead += lineBreak;
+                       position = lineHead;
+                       col = 0;
+               } else {
+                       DrawChar(s[i], dest, position);
+                       position += step;
+                       ++col;
+               }
+       }
+}
+
+void Font::DrawStringRight(const char *s, SDL_Surface *dest, const Vector<int> &positionIn, int maxWidth) const {
+       // NOTE: this does not handle line breaks
+       if (!sprite) return;
+
+       int length(0);
+       while (length < maxWidth && s[length] != '\0') {
+               ++length;
        }
+       Vector<int> position(positionIn.X() - length * CharWidth(), positionIn.Y());
+
+       DrawString(s, dest, position, length);
 }
 
 void Font::DrawDigit(int digit, SDL_Surface *dest, const Vector<int> &position) const {
@@ -74,14 +99,19 @@ void Font::DrawNumber(int numberIn, SDL_Surface *dest, const Vector<int> &positi
        }
 }
 
+void Font::DrawNumberRight(int number, SDL_Surface *dest, const Vector<int> &positionIn, int digits) const {
+       if (!sprite) return;
+
+       Vector<int> position(positionIn.X() - digits * CharWidth(), positionIn.Y());
+
+       DrawNumber(number, dest, position, digits);
+}
+
 
 void Font::CreateTypeDescription() {
        Font f;
 
-       int numberId(TypeDescription::GetTypeId("Number"));
-       int spriteId(TypeDescription::GetTypeId("Sprite"));
-
-       TypeDescription &td(TypeDescription::CreateOrGet("Font"));
+       TypeDescription &td(TypeDescription::Create(TYPE_ID, "Font"));
        td.SetDescription(
                        "Simple font with fixed-width characters using a sprite for rendering.\n"
                        "Characters from strings are mapped as follows:\n"
@@ -90,9 +120,9 @@ void Font::CreateTypeDescription() {
        td.SetConstructor(&Construct);
        td.SetSize(sizeof(Font));
 
-       td.AddField("sprite", FieldDescription(((char *)&f.sprite) - ((char *)&f), spriteId).SetReferenced().SetDescription("a sprite where each tile corresponds to a character"));
-       td.AddField("columnoffset", FieldDescription(((char *)&f.colOffset) - ((char *)&f), numberId).SetDescription("offset of the column of the first character"));
-       td.AddField("rowoffset", FieldDescription(((char *)&f.rowOffset) - ((char *)&f), numberId).SetDescription("offset of the row of the first character"));
+       td.AddField("sprite", FieldDescription(((char *)&f.sprite) - ((char *)&f), Sprite::TYPE_ID).SetReferenced().SetDescription("a sprite where each tile corresponds to a character"));
+       td.AddField("columnoffset", FieldDescription(((char *)&f.colOffset) - ((char *)&f), Interpreter::NUMBER_ID).SetDescription("offset of the column of the first character"));
+       td.AddField("rowoffset", FieldDescription(((char *)&f.rowOffset) - ((char *)&f), Interpreter::NUMBER_ID).SetDescription("offset of the row of the first character"));
 }
 
 void Font::Construct(void *data) {