From bfa4a2e11e0c31418d21a91eca7495589c50c11e Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 25 Mar 2009 19:14:04 -0600
Subject: Merged relevent changes from TMW commit
 dfcc6397848d4597b386b688f689352de6c19ae2

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 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


From 22974109dd0e9ae2b915cc2c258df1f01a65b729 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Fri, 27 Mar 2009 00:01:39 +0100
Subject: Fixed duplicate check for item names

---
 src/being.cpp            | 2 +-
 src/resources/itemdb.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/being.cpp')

diff --git a/src/being.cpp b/src/being.cpp
index 61826089..8f00fd3c 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -203,7 +203,7 @@ void Being::takeDamage(Being *attacker, int amount, AttackType type)
         color = &guiPalette->getColor(Palette::HIT_CRITICAL);
     }
     else if (!amount)
-     {
+    {
         if (attacker == player_node)
         {
             // This is intended to be the wrong direction to visually
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 2b94bd61..49913300 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -125,12 +125,12 @@ void ItemDB::load()
             mItemInfos[id] = itemInfo;
             if (!name.empty())
             {
-                NamedItemInfoIterator itr = mNamedItemInfos.find(name);
+                std::string temp = name;
+                toLower(trim(temp));
+
+                NamedItemInfoIterator itr = mNamedItemInfos.find(temp);
                 if (itr == mNamedItemInfos.end())
                 {
-                    std::string temp = name;
-                    toLower(trim(temp));
-
                     mNamedItemInfos[temp] = itemInfo;
                 }
                 else
-- 
cgit v1.2.3-60-g2f50