reworked gauges to better reflect the original ones

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

diff --git a/src/graphics/Font.cpp b/src/graphics/Font.cpp
index 0ff3d9d4d90360b997277ee20226920d1e4d6bb2..d3a3de06d5396677ace4b5007aa79475a9995976 100644 (file)
--- a/src/graphics/Font.cpp
+++ b/src/graphics/Font.cpp
@@ -18,6 +18,20 @@ using std::pow;
 
 namespace graphics {
 
+void Font::DrawChar(char c, SDL_Surface *dest, Point<int> position) const {
+       if (!HasChar(c)) return;
+       const Mapping &m(map[(unsigned char)c]);
+       sprite->Draw(dest, position, m.col, m.row);
+}
+
+void Font::DrawString(const char *s, SDL_Surface *dest, Point<int> positionIn, int maxChars) const {
+       Point<int> position(positionIn);
+       Vector<int> step(CharWidth(), 0);
+       for (int i(0); s[i] && (maxChars <= 0 || i < maxChars); ++i, position += step) {
+               DrawChar(s[i], dest, position);
+       }
+}
+
 void Font::DrawDigit(int digit, SDL_Surface *dest, Point<int> position) const {
        sprite->Draw(dest, position, digitsCol + digit, digitsRow);
 }
@@ -33,7 +47,7 @@ void Font::DrawNumber(int numberIn, SDL_Surface *dest, Point<int> positionIn, in
 
        if (digits > 0) {
                int i(digits - 1);
-               while (number < pow(10.0, i)) {
+               while (number < pow(10.0, i) && i > 0) {
                        position += step;
                        --i;
                }