diff options
author | Ira Rice <irarice@gmail.com> | 2009-02-08 19:59:28 -0700 |
---|---|---|
committer | Ira Rice <irarice@gmail.com> | 2009-02-08 19:59:28 -0700 |
commit | 40edf4e91558cffd83d9015a2cf4a16360e27855 (patch) | |
tree | 7e0f53ab1c82f694412a94856fc2a9ba05d87370 /src/being.cpp | |
parent | 450edb5900a46ada0cc6292f0079a31ea5d04573 (diff) | |
download | mana-40edf4e91558cffd83d9015a2cf4a16360e27855.tar.gz mana-40edf4e91558cffd83d9015a2cf4a16360e27855.tar.bz2 mana-40edf4e91558cffd83d9015a2cf4a16360e27855.tar.xz mana-40edf4e91558cffd83d9015a2cf4a16360e27855.zip |
Mostly fixed a few field values to behave better in Windows, as well as
removed the need for sending graphics to the setSpeech function (since
it isn't needed) and started actually using the time variable which it's
passed (could be set to show the speech longer if the dialog is
longer, for example).
Signed-off-by: Ira Rice <irarice@gmail.com>
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 2b4ba767..9b8ede27 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -215,7 +215,7 @@ void Being::setSpeech(const std::string &text, Uint32 time) } if (mSpeech != "") - mSpeechTime = 500; + mSpeechTime = time <= SPEECH_MAX_TIME ? time : SPEECH_MAX_TIME; } void Being::takeDamage(int amount) @@ -501,7 +501,7 @@ void Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY) emotionSet[emotionIndex]->draw(graphics, px, py); } -void Being::drawSpeech(Graphics *graphics, int offsetX, int offsetY) +void Being::drawSpeech(int offsetX, int offsetY) { int px = mPx + offsetX; int py = mPy + offsetY; |