pass point as reference in graphics Draw functions

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

diff --git a/src/graphics/Font.cpp b/src/graphics/Font.cpp
index d3a3de06d5396677ace4b5007aa79475a9995976..1dc90516ccae28455231d7d919b7ba650a891692 100644 (file)
--- a/src/graphics/Font.cpp
+++ b/src/graphics/Font.cpp
@@ -18,13 +18,13 @@ 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::DrawChar(char c, SDL_Surface *dest, const Point<int> &position) const {
+       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 {
+void Font::DrawString(const char *s, SDL_Surface *dest, const 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) {
@@ -32,11 +32,11 @@ 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);
+void Font::DrawDigit(int digit, SDL_Surface *dest, const Point<int> &position) const {
+       DrawChar(digit + 0x30, dest, position);
 }
 
-void Font::DrawNumber(int numberIn, SDL_Surface *dest, Point<int> positionIn, int digits) const {
+void Font::DrawNumber(int numberIn, SDL_Surface *dest, const Point<int> &positionIn, int digits) const {
        int number(numberIn);
        if (digits > 0 && numberIn >= pow(10.0, digits)) {
                numberIn = pow(10.0, digits) - 1;