Merge branch 'loader'

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

diff --git a/src/graphics/Font.cpp b/src/graphics/Font.cpp
index 135775c1412061224b1e9434acc2d7f19245e80c..ca06a076a80c251a17f7fead31171d7ce5c6a1a3 100644 (file)
--- a/src/graphics/Font.cpp
+++ b/src/graphics/Font.cpp
@@ -7,47 +7,52 @@
 
 #include "Font.h"
 
-#include "../geometry/operators.h"
-#include "../geometry/Vector.h"
-
 #include <cmath>
+#include <iostream>
 
-using geometry::Point;
 using geometry::Vector;
 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 Vector<int> &position) const {
+       if (!sprite) return;
+
+       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 {
-       Point<int> position(positionIn);
+void Font::DrawString(const char *s, SDL_Surface *dest, const Vector<int> &positionIn, int maxChars) const {
+       if (!sprite) return;
+
+       Vector<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);
+void Font::DrawDigit(int digit, SDL_Surface *dest, const Vector<int> &position) const {
+       if (!sprite) return;
+
+       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 Vector<int> &positionIn, int digits) const {
+       if (!sprite) return;
+
        int number(numberIn);
        if (digits > 0 && numberIn >= pow(10.0, digits)) {
                numberIn = pow(10.0, digits) - 1;
        }
 
-       Point<int> position(positionIn);
+       Vector<int> position(positionIn);
        Vector<int> step(sprite->Width(), 0);
 
        if (digits > 0) {
                int i(digits - 1);
-               while (number < pow(10.0, i)) {
+               while (number < pow(10.0, i) && i > 0) {
                        position += step;
                        --i;
                }