renamed namespace geometry -> math

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

diff --git a/src/graphics/Font.cpp b/src/graphics/Font.cpp
index ba5c64d4dbdcf29d79fc671464269d33bdc7cdc8..9b415514f44f185c3a147580f4721d0470cc1b77 100644 (file)
--- a/src/graphics/Font.cpp
+++ b/src/graphics/Font.cpp
@@ -4,9 +4,10 @@
 #include "../loader/TypeDescription.h"
 
 #include <cmath>
+#include <cstring>
 #include <iostream>
 
-using geometry::Vector;
+using math::Vector;
 using loader::FieldDescription;
 using loader::Interpreter;
 using loader::TypeDescription;
@@ -76,8 +77,12 @@ void Font::DrawStringRight(const char *s, SDL_Surface *dest, const Vector<int> &
        if (!sprite) return;
 
        int length(0);
-       while (length < maxWidth && s[length] != '\0') {
-               ++length;
+       if (maxWidth > 0) {
+               while (length < maxWidth && s[length] != '\0') {
+                       ++length;
+               }
+       } else {
+               length = std::strlen(s);
        }
        Vector<int> position(positionIn.X() - length * CharWidth(), positionIn.Y());
 
@@ -124,7 +129,16 @@ 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());
+       Vector<int> position(positionIn);
+       if (digits > 0) {
+               position.X() -= digits * CharWidth();
+       } else if (number == 0) {
+               position.X() -= CharWidth();
+       } else {
+               for (int i = number; i > 0; i /= 10) {
+                       position.X() -= CharWidth();
+               }
+       }
 
        DrawNumber(number, dest, position, digits);
 }