diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-12-16 02:01:28 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-12-16 02:01:28 +0300 |
| commit | b49d05166ac67ed0ef189b1e3859573108843db1 (patch) | |
| tree | d8f4eaa6735938ab7db9aa11b0857485f865ad94 | |
| parent | 910e16e9c485a0ffa02d5cc39d0df0a467cf8cf7 (diff) | |
| download | manaverse-b49d05166ac67ed0ef189b1e3859573108843db1.tar.gz manaverse-b49d05166ac67ed0ef189b1e3859573108843db1.tar.bz2 manaverse-b49d05166ac67ed0ef189b1e3859573108843db1.tar.xz manaverse-b49d05166ac67ed0ef189b1e3859573108843db1.zip | |
Remove default parameters from text.
| -rw-r--r-- | src/being/being.cpp | 6 | ||||
| -rw-r--r-- | src/text.h | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp index daf8cd542..61826f494 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -648,7 +648,8 @@ void Being::setSpeech(const std::string &restrict text, mPixelY - getHeight(), Graphics::CENTER, &userPalette->getColor(UserColorId::PARTICLE), - Speech_true); + Speech_true, + nullptr); mText->adviseXY(mPixelX, (mY + 1) * mapTileSize - getHeight() - mText->getHeight() - 9, mMoveNames); @@ -2413,7 +2414,8 @@ void Being::drawSpeech(const int offsetX, mPixelY - getHeight(), Graphics::CENTER, &theme->getColor(ThemeColorId::BUBBLE_TEXT, 255), - Speech_true); + Speech_true, + nullptr); mText->adviseXY(mPixelX, (mY + 1) * mapTileSize - getHeight() - mText->getHeight() - 9, mMoveNames); diff --git a/src/text.h b/src/text.h index e2bdfaae4..ea013aa44 100644 --- a/src/text.h +++ b/src/text.h @@ -47,8 +47,8 @@ class Text notfinal const int x, const int y, const Graphics::Alignment alignment, const Color *const color, - const Speech isSpeech = Speech_false, - Font *const font = nullptr); + const Speech isSpeech, + Font *const font); A_DELETE_COPY(Text) @@ -129,7 +129,8 @@ class FlashText final : public Text * Draws the text. */ void draw(Graphics *const graphics, - const int xOff, const int yOff) override final A_NONNULL(2); + const int xOff, + const int yOff) override final A_NONNULL(2); private: int mTime; /**< Time left for flashing */ |