diff options
| author | peavey <peavey@inspircd.org> | 2009-05-10 22:27:24 +0200 |
|---|---|---|
| committer | peavey <peavey@inspircd.org> | 2009-05-10 22:27:24 +0200 |
| commit | b5e8d34910b4595b40f1210fbdd06a3a0bd9b7b7 (patch) | |
| tree | c3d1f373528e4de0f35f4c9021c60f8805fd3545 /src/being.cpp | |
| parent | e6c1af6d47aa79f02e0bf20ade42158511f25c69 (diff) | |
| parent | cba524cbd0641cdf9e2e19eda453ab7518d8dca0 (diff) | |
| download | mana-client-b5e8d34910b4595b40f1210fbdd06a3a0bd9b7b7.tar.gz mana-client-b5e8d34910b4595b40f1210fbdd06a3a0bd9b7b7.tar.bz2 mana-client-b5e8d34910b4595b40f1210fbdd06a3a0bd9b7b7.tar.xz mana-client-b5e8d34910b4595b40f1210fbdd06a3a0bd9b7b7.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/being.cpp')
| -rw-r--r-- | src/being.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/being.cpp b/src/being.cpp index 4c4706db..2b31e9ec 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -396,7 +396,7 @@ void Being::setSpeech(const std::string &text, int time) if (!mSpeech.empty()) mSpeechTime = time <= SPEECH_MAX_TIME ? time : SPEECH_MAX_TIME; - const int speech = (int) config.getValue("speech", NAME_IN_BUBBLE); + const int speech = (int) config.getValue("speech", TEXT_OVERHEAD); if (speech == TEXT_OVERHEAD) { if (mText) @@ -776,7 +776,7 @@ void Being::drawSpeech(int offsetX, int offsetY) { const int px = mPx - offsetX; const int py = mPy - offsetY; - const int speech = (int) config.getValue("speech", NAME_IN_BUBBLE); + const int speech = (int) config.getValue("speech", TEXT_OVERHEAD); // Draw speech above this being if (mSpeechTime == 0) |