From 7f819e46b584145e2cf2ea742ced9fab0ffc233e Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 26 Nov 2006 14:20:50 +0000
Subject: Made Being::mDirection protected, forcing the use of setDirection.
 Defaulted variant argument to 0 since this is the most common situation. Some
 SpriteDef refactoring, splitting up the loading into several methods, in
 preparation of adding support for including other sprites.

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

(limited to 'src/player.cpp')

diff --git a/src/player.cpp b/src/player.cpp
index d6bd42f1..cd6986b3 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -94,12 +94,12 @@ Player::setSex(Uint8 sex)
         if (sex == 0)
         {
             mSprites[BASE_SPRITE] = new AnimatedSprite(
-                    "graphics/sprites/player_male_base.xml", 0);
+                    "graphics/sprites/player_male_base.xml");
         }
         else
         {
             mSprites[BASE_SPRITE] = new AnimatedSprite(
-                    "graphics/sprites/player_female_base.xml", 0);
+                    "graphics/sprites/player_female_base.xml");
         }
 
         //reload equipment
@@ -109,8 +109,8 @@ Player::setSex(Uint8 sex)
             {
                 delete mSprites[i];
                 mSprites[i] = new AnimatedSprite(
-                        "graphics/sprites/" + EquipmentDB::get(mEquipmentSpriteIDs.at(i))->getSprite(sex),
-                        0);
+                        "graphics/sprites/" + EquipmentDB::get(
+                            mEquipmentSpriteIDs.at(i))->getSprite(sex));
             }
         }
     }
@@ -130,16 +130,20 @@ Player::setWeapon(Uint16 weapon)
         switch (weapon)
         {
             case 0:
-                mSprites[WEAPON_SPRITE] = new AnimatedSprite("graphics/sprites/weapon-fist.xml", 0);
+                mSprites[WEAPON_SPRITE] =
+                    new AnimatedSprite("graphics/sprites/weapon-fist.xml");
                 break;
             case 1:
-                mSprites[WEAPON_SPRITE] = new AnimatedSprite("graphics/sprites/weapon-dagger.xml", 0);
+                mSprites[WEAPON_SPRITE] =
+                    new AnimatedSprite("graphics/sprites/weapon-dagger.xml");
                 break;
             case 2:
-                mSprites[WEAPON_SPRITE] = new AnimatedSprite("graphics/sprites/weapon-bow.xml", 0);
+                mSprites[WEAPON_SPRITE] =
+                    new AnimatedSprite("graphics/sprites/weapon-bow.xml");
                 break;
             case 3:
-                mSprites[WEAPON_SPRITE] = new AnimatedSprite("graphics/sprites/weapon-scythe.xml", 0);
+                mSprites[WEAPON_SPRITE] =
+                    new AnimatedSprite("graphics/sprites/weapon-scythe.xml");
                 break;
         }
     }
@@ -215,13 +219,11 @@ Player::setVisibleEquipment(Uint8 slot, int id)
         if (mSex == 0)
         {
             equipmentSprite = new AnimatedSprite(
-                "graphics/sprites/" + EquipmentDB::get(id)->getSprite(0),
-                0);
+                "graphics/sprites/" + EquipmentDB::get(id)->getSprite(0));
         }
         else {
             equipmentSprite = new AnimatedSprite(
-                "graphics/sprites/" + EquipmentDB::get(id)->getSprite(1),
-                0);
+                "graphics/sprites/" + EquipmentDB::get(id)->getSprite(1));
         }
 
         equipmentSprite->setDirection(getSpriteDirection());
-- 
cgit v1.2.3-70-g09d2