From d25e1c9b0dac7fcfe803083af1189489d5a9ad88 Mon Sep 17 00:00:00 2001
From: Björn Steinbrink <B.Steinbrink@gmx.de>
Date: Sat, 5 Aug 2006 02:20:34 +0000
Subject: Some cleanups, mostly lowering indentation levels.

---
 src/player.cpp | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'src/player.cpp')

diff --git a/src/player.cpp b/src/player.cpp
index 2e119e2d..c626fd09 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -107,11 +107,7 @@ Player::setHairColor(Uint16 color)
 {
     if (color != mHairColor && mHairStyle > 0)
     {
-        if (mSprites[HAIR_SPRITE])
-        {
-            delete mSprites[HAIR_SPRITE];
-        }
-
+        delete mSprites[HAIR_SPRITE];
         AnimatedSprite *newHairSprite = new AnimatedSprite(
                 "graphics/sprites/hairstyle" + toString(mHairStyle) + ".xml",
                 color - 1);
@@ -130,11 +126,7 @@ Player::setHairStyle(Uint16 style)
 {
     if (style != mHairStyle && mHairColor > 0)
     {
-        if (mSprites[HAIR_SPRITE])
-        {
-            delete mSprites[HAIR_SPRITE];
-        }
-
+        delete mSprites[HAIR_SPRITE];
         AnimatedSprite *newHairSprite = new AnimatedSprite(
                 "graphics/sprites/hairstyle" + toString(style) + ".xml",
                 mHairColor - 1);
@@ -164,11 +156,11 @@ Player::setVisibleEquipment(Uint8 slot, Uint8 id)
             position = TOPCLOTHES_SPRITE;
             break;
     }
+
+    delete mSprites[position];
+    mSprites[position] = NULL;
+
     // id = 0 means unequip
-    if (mSprites[position]) {
-        delete mSprites[position];
-        mSprites[position] = NULL;
-    }
     if (id) {
         char stringId[4];
         sprintf(stringId, "%03i", id);
-- 
cgit v1.2.3-70-g09d2