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) {
}
}
-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;
if (digits > 0) {
int i(digits - 1);
- while (number < pow(10.0, i)) {
+ while (number < pow(10.0, i) && i > 0) {
position += step;
--i;
}