From: Daniel Karbach Date: Thu, 29 Nov 2012 13:34:01 +0000 (+0100) Subject: handle line breaks in Font::DrawString X-Git-Url: http://git.localhorst.tv/?a=commitdiff_plain;ds=inline;h=9648fd7d258ae1a2baccb8dd5b6f7a9491e55803;hp=67817384452d1d8955169c0dc648774e71ea3abe;p=l2e.git handle line breaks in Font::DrawString note that Font::DrawStringRight does _not_ handle line breaks as of now --- diff --git a/src/graphics/Font.cpp b/src/graphics/Font.cpp index 59059e0..94d451a 100644 --- a/src/graphics/Font.cpp +++ b/src/graphics/Font.cpp @@ -29,21 +29,32 @@ void Font::DrawChar(char c, SDL_Surface *dest, const Vector &position) cons sprite->Draw(dest, position, col, row); } -void Font::DrawString(const char *s, SDL_Surface *dest, const Vector &positionIn, int maxChars) const { +void Font::DrawString(const char *s, SDL_Surface *dest, const Vector &positionIn, int maxWidth) const { if (!sprite) return; Vector position(positionIn); + Vector lineHead(positionIn); Vector step(CharWidth(), 0); - for (int i(0); s[i] && (maxChars <= 0 || i < maxChars); ++i, position += step) { - DrawChar(s[i], dest, position); + Vector lineBreak(0, CharHeight()); + for (int i(0), col(0); s[i] && (maxWidth <= 0 || col < maxWidth); ++i) { + if (s[i] == '\n') { + lineHead += lineBreak; + position = lineHead; + col = 0; + } else { + DrawChar(s[i], dest, position); + position += step; + ++col; + } } } -void Font::DrawStringRight(const char *s, SDL_Surface *dest, const Vector &positionIn, int maxChars) const { +void Font::DrawStringRight(const char *s, SDL_Surface *dest, const Vector &positionIn, int maxWidth) const { + // NOTE: this does not handle line breaks if (!sprite) return; int length(0); - while (length < maxChars && s[length] != '\0') { + while (length < maxWidth && s[length] != '\0') { ++length; } Vector position(positionIn.X() - length * CharWidth(), positionIn.Y()); diff --git a/src/graphics/Font.h b/src/graphics/Font.h index b981946..6a8a5c2 100644 --- a/src/graphics/Font.h +++ b/src/graphics/Font.h @@ -30,8 +30,8 @@ public: int CharWidth() const { return sprite->Width(); } int CharHeight() const { return sprite->Height(); } void DrawChar(char c, SDL_Surface *dest, const geometry::Vector &position) const; - void DrawString(const char *s, SDL_Surface *dest, const geometry::Vector &position, int maxChars = 0) const; - void DrawStringRight(const char *s, SDL_Surface *dest, const geometry::Vector &position, int maxChars = 0) const; + void DrawString(const char *s, SDL_Surface *dest, const geometry::Vector &position, int maxWidth = 0) const; + void DrawStringRight(const char *s, SDL_Surface *dest, const geometry::Vector &position, int maxWidth = 0) const; void DrawDigit(int d, SDL_Surface *dest, const geometry::Vector &position) const; void DrawNumber(int n, SDL_Surface *dest, const geometry::Vector &position, int digits = 0) const; void DrawNumberRight(int n, SDL_Surface *dest, const geometry::Vector &position, int digits = 0) const;