diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-27 13:25:04 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-27 13:25:24 +0100 |
| commit | dd05447445dc1766e532130318af2cb6bb72a994 (patch) | |
| tree | c8b2cbac64ccf9545a39c143088b57fe2cb8e678 /src/being.cpp | |
| parent | 05e753294c1a603252d2eed4b1731c3f50543a7e (diff) | |
| parent | 2aab736bc5d77ffda789d7de56cef100fac207e1 (diff) | |
| download | Mana-dd05447445dc1766e532130318af2cb6bb72a994.tar.gz Mana-dd05447445dc1766e532130318af2cb6bb72a994.tar.bz2 Mana-dd05447445dc1766e532130318af2cb6bb72a994.tar.xz Mana-dd05447445dc1766e532130318af2cb6bb72a994.zip | |
Merge branch 'aethyra/master'
Conflicts:
src/beingmanager.cpp
src/gui/confirm_dialog.cpp
src/gui/inventorywindow.cpp
src/gui/inventorywindow.h
src/gui/label.cpp
src/gui/label.h
src/gui/popup.cpp
src/gui/popup.h
src/gui/scrollarea.cpp
src/gui/skin.cpp
src/gui/skin.h
src/gui/speechbubble.cpp
src/gui/window.cpp
src/gui/window.h
src/localplayer.h
src/main.cpp
src/net/ea/playerhandler.cpp
src/resources/ambientoverlay.h
src/resources/dye.cpp
src/resources/imagewriter.cpp
src/resources/itemdb.cpp
src/shopitem.cpp
Diffstat (limited to 'src/being.cpp')
| -rw-r--r-- | src/being.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/being.cpp b/src/being.cpp index 921ed75e..e143d506 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -409,7 +409,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 @@ -1049,9 +1049,8 @@ void Being::load() int hairstyles = 1; while (ItemDB::get(-hairstyles).getSprite(GENDER_MALE) != "error.xml") - { hairstyles++; - } + mNumberOfHairstyles = hairstyles; XML::Document doc(HAIR_FILE); |