X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2FFont.cpp;h=1dc90516ccae28455231d7d919b7ba650a891692;hb=6a3c11d028e0c5f69f910cee37cbf6eb6d5e04d9;hp=135775c1412061224b1e9434acc2d7f19245e80c;hpb=2f2dad58f3b9f7c98cf20211929ff31f5ebf5e5f;p=l2e.git

diff --git a/src/graphics/Font.cpp b/src/graphics/Font.cpp
index 135775c..1dc9051 100644
--- 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;
@@ -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;
 		}