diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-05-09 21:08:37 +0200 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-05-09 21:11:29 +0200 |
commit | f790281b94d37f7ea2c2e8fc7b121266d88f93bb (patch) | |
tree | 8ab2f3155ef6422d0d4f6f436a356038b9b5463a /src/being.cpp | |
parent | 3dacb9b09622375d35d704c8ac9d7039d506026f (diff) | |
download | mana-f790281b94d37f7ea2c2e8fc7b121266d88f93bb.tar.gz mana-f790281b94d37f7ea2c2e8fc7b121266d88f93bb.tar.bz2 mana-f790281b94d37f7ea2c2e8fc7b121266d88f93bb.tar.xz mana-f790281b94d37f7ea2c2e8fc7b121266d88f93bb.zip |
Increased the distance between head and overhead text a bit
Plus some small code cleanups.
Diffstat (limited to 'src/being.cpp')
-rw-r--r-- | src/being.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/being.cpp b/src/being.cpp index 843f7da6..4c4706db 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -123,7 +123,6 @@ Being::~Being() { mUsedTargetCursor = NULL; delete_all(mSprites); - clearPath(); if (player_node && player_node->getTarget() == this) player_node->setTarget(NULL); @@ -146,7 +145,7 @@ void Being::setPosition(const Vector &pos) if (mText) mText->adviseXY(mPx, - mPy - getHeight() - mText->getHeight()); + mPy - getHeight() - mText->getHeight() - 6); } #ifdef EATHENA_SUPPORT @@ -363,7 +362,7 @@ void Being::setSpeech(const std::string &text, int time) // Trim whitespace trim(mSpeech); - // check for links + // Check for links std::string::size_type start = mSpeech.find('['); std::string::size_type end = mSpeech.find(']', start); @@ -398,7 +397,8 @@ void Being::setSpeech(const std::string &text, int time) mSpeechTime = time <= SPEECH_MAX_TIME ? time : SPEECH_MAX_TIME; const int speech = (int) config.getValue("speech", NAME_IN_BUBBLE); - if (speech == TEXT_OVERHEAD) { + if (speech == TEXT_OVERHEAD) + { if (mText) delete mText; @@ -415,7 +415,7 @@ void Being::takeDamage(Being *attacker, int amount, AttackType type) gcn::Font *font; std::string damage = amount ? toString(amount) : type == FLEE ? "dodge" : "miss"; - const gcn::Color* color; + const gcn::Color *color; font = gui->getInfoParticleFont(); |