diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-01-11 01:34:11 +0200 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-01-11 01:34:11 +0200 |
| commit | fcced13d9972ac70f0f01f19583b7868e255b6a7 (patch) | |
| tree | 9b01df102c5f9ba032ea0f9bc413dd707e99d88b /src/being.h | |
| parent | 311783bebbe2bed366dca5097697ce34c690292d (diff) | |
| parent | ef1b9856c86512fe73154c17da3ea98a7cd5f896 (diff) | |
| download | plus-fcced13d9972ac70f0f01f19583b7868e255b6a7.tar.gz plus-fcced13d9972ac70f0f01f19583b7868e255b6a7.tar.bz2 plus-fcced13d9972ac70f0f01f19583b7868e255b6a7.tar.xz plus-fcced13d9972ac70f0f01f19583b7868e255b6a7.zip | |
Merge branch 'master' into invfiler
Diffstat (limited to 'src/being.h')
| -rw-r--r-- | src/being.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/being.h b/src/being.h index 09466f5af..f9731366a 100644 --- a/src/being.h +++ b/src/being.h @@ -520,6 +520,7 @@ class Being : public ActorSprite, public ConfigListener int posX, int posY) const; void drawHpBar(Graphics *graphics, int x, int y, + int maxHP, int hp, int damage, int color1, int color2, int width, int height) const; static void load(); @@ -751,7 +752,7 @@ class Being : public ActorSprite, public ConfigListener static bool mDrawHotKeys; static bool mShowBattleEvents; static bool mShowMobHP; -// std::string mDisplayName; + static bool mShowOwnHP; unsigned int mMoveTime; unsigned int mAttackTime; |