From bfa4a2e11e0c31418d21a91eca7495589c50c11e Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Wed, 25 Mar 2009 19:14:04 -0600 Subject: Merged relevent changes from TMW commit dfcc6397848d4597b386b688f689352de6c19ae2 Signed-off-by: Ira Rice --- src/being.cpp | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) (limited to 'src/being.cpp') diff --git a/src/being.cpp b/src/being.cpp index 3a772fbd..61826089 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -534,32 +534,18 @@ int Being::getOffset(char pos, char neg) const int Being::getWidth() const { - if (mSprites[BASE_SPRITE]) - { - const int width = mSprites[BASE_SPRITE]->getWidth() > DEFAULT_WIDTH ? - mSprites[BASE_SPRITE]->getWidth() : - DEFAULT_WIDTH; - return width; - } + if (AnimatedSprite *base = mSprites[BASE_SPRITE]) + return std::max(base->getWidth(), DEFAULT_WIDTH); else - { return DEFAULT_WIDTH; - } } int Being::getHeight() const { - if (mSprites[BASE_SPRITE]) - { - const int height = mSprites[BASE_SPRITE]->getHeight() > DEFAULT_HEIGHT ? - mSprites[BASE_SPRITE]->getHeight() : - DEFAULT_HEIGHT; - return height; - } + if (AnimatedSprite *base = mSprites[BASE_SPRITE]) + return std::max(base->getHeight(), DEFAULT_HEIGHT); else - { return DEFAULT_HEIGHT; - } } void Being::setTargetAnimation(SimpleAnimation* animation) @@ -575,9 +561,8 @@ void Being::load() int hairstyles = 1; while (ItemDB::get(-hairstyles).getSprite(GENDER_MALE) != "error.xml") - { hairstyles++; - } + mNumberOfHairstyles = hairstyles; } -- cgit v1.2.3-60-g2f50