X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FFont.cpp;h=3e462498009c3ada54a2cffa7a78194620d22dd6;hb=ebeefe8b81fbb2e69939d67972453c01b023ec22;hp=d3a3de06d5396677ace4b5007aa79475a9995976;hpb=fb10fbd4a72793048916557308772fdaa2afebc2;p=l2e.git diff --git a/src/graphics/Font.cpp b/src/graphics/Font.cpp index d3a3de0..3e46249 100644 --- 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 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 positionIn, int maxChars) const { @@ -33,7 +33,7 @@ void Font::DrawString(const char *s, SDL_Surface *dest, Point positionIn, i } void Font::DrawDigit(int digit, SDL_Surface *dest, Point position) const { - sprite->Draw(dest, position, digitsCol + digit, digitsRow); + DrawChar(digit + 0x30, dest, position); } void Font::DrawNumber(int numberIn, SDL_Surface *dest, Point positionIn, int digits) const {