diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-12-27 01:55:25 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-12-27 01:55:25 +0300 |
| commit | 916a3d76da98d078a807044c43d1a70bc146ba70 (patch) | |
| tree | 88d7381a5b27c085e4f31363b50c6fe444372741 | |
| parent | 4048cb70745cb872d020603614e077c92e0d01b8 (diff) | |
| download | manaplus-916a3d76da98d078a807044c43d1a70bc146ba70.tar.gz manaplus-916a3d76da98d078a807044c43d1a70bc146ba70.tar.bz2 manaplus-916a3d76da98d078a807044c43d1a70bc146ba70.tar.xz manaplus-916a3d76da98d078a807044c43d1a70bc146ba70.zip | |
Remove default parameters from speechbubble.
| -rw-r--r-- | src/being/being.cpp | 4 | ||||
| -rw-r--r-- | src/gui/popups/speechbubble.h | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp index 769c0d93f..d51b45fbd 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -656,7 +656,9 @@ void Being::setSpeech(const std::string &restrict text) restrict2 createSpeechBubble(); if (mSpeechBubble != nullptr) { - mSpeechBubble->setCaption(isShowName ? mName : ""); + mSpeechBubble->setCaption(isShowName ? mName : "", + &theme->getColor(ThemeColorId::BUBBLE_NAME, 255), + &theme->getColor(ThemeColorId::BUBBLE_NAME_OUTLINE, 255)); mSpeechBubble->setText(mSpeech, isShowName); } } diff --git a/src/gui/popups/speechbubble.h b/src/gui/popups/speechbubble.h index 694a6eb2a..bd8b79cf4 100644 --- a/src/gui/popups/speechbubble.h +++ b/src/gui/popups/speechbubble.h @@ -45,15 +45,14 @@ class SpeechBubble final : public Popup * Sets the name displayed for the speech bubble, and in what color. */ void setCaption(const std::string &name, - const Color *const color1 = &theme->getColor( - ThemeColorId::BUBBLE_NAME, 255), - const Color *const color2 = &theme->getColor( - ThemeColorId::BUBBLE_NAME_OUTLINE, 255)); + const Color *const color1, + const Color *const color2); /** * Sets the text to be displayed. */ - void setText(const std::string &text, const bool showName = true); + void setText(const std::string &text, + const bool showName); void requestMoveToBackground(); |