forced fonts to use the data's charset

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

diff --git a/src/graphics/Font.cpp b/src/graphics/Font.cpp
index 135775c1412061224b1e9434acc2d7f19245e80c..3e462498009c3ada54a2cffa7a78194620d22dd6 100644 (file)
--- a/src/graphics/Font.cpp
+++ b/src/graphics/Font.cpp
@@ -19,9 +19,9 @@ 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);
+       int col(colOffset + (c % 0x10));
+       int row(rowOffset + (c / 0x10));
+       sprite->Draw(dest, position, col, row);
 }
 
 void Font::DrawString(const char *s, SDL_Surface *dest, Point<int> positionIn, int maxChars) const {
@@ -33,7 +33,7 @@ void Font::DrawString(const char *s, SDL_Surface *dest, Point<int> positionIn, i
 }
 
 void Font::DrawDigit(int digit, SDL_Surface *dest, Point<int> position) const {
-       sprite->Draw(dest, position, digitsCol + digit, digitsRow);
+       DrawChar(digit + 0x30, dest, position);
 }
 
 void Font::DrawNumber(int numberIn, SDL_Surface *dest, Point<int> positionIn, int digits) const {
@@ -47,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;
                }