summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--src/being.cpp4
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 666d4a96..c70c2560 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2006-05-12 Eugenio Favalli <elvenprogrammer@gmail.com>
+2006-05-12 Björn Steinbrink <B.Steinbrink@gmx.de>
+
+ * src/being.cpp: Fixed initialization order in Being ctor.
+
+2006-05-12 Eugenio Favalli <elvenprogrammer@gmail.com>
* data/graphics/sprites/item1202.png,
data/graphics/sprites/Makefile.am, src/being.cpp, src/being.h,
@@ -2137,4 +2141,4 @@
restore some doxygen comments, improved size adaption and made the
window a shorter.
* data/graphics/images/login_wallpaper.png: New login wallpaper by
- Momotaro. \ No newline at end of file
+ Momotaro.
diff --git a/src/being.cpp b/src/being.cpp
index 9e2e3d7d..7ce31c93 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -49,6 +49,7 @@ Being::Being(Uint32 id, Uint16 job, Map *map):
mWalkTime(0),
mEmotion(0), mEmotionTime(0),
mAttackSpeed(350),
+ mEquipment(new Equipment()),
mId(id),
mWeapon(0),
mWalkSpeed(150),
@@ -57,8 +58,7 @@ Being::Being(Uint32 id, Uint16 job, Map *map):
mSpeechTime(0),
mDamageTime(0),
mShowSpeech(false), mShowDamage(false),
- mSpriteset(NULL), mSpriteFrame(0),
- mEquipment(new Equipment())
+ mSpriteset(NULL), mSpriteFrame(0)
{
setMap(map);
}