diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-03-03 02:50:03 +0200 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-03-03 02:50:03 +0200 |
| commit | de51eaa43e05c2126fc1eef2a7e115843f972547 (patch) | |
| tree | 286a05a069e048247f90c7595f1b8939be784608 /src/actorsprite.h | |
| parent | d4c08d3bf69410a35a50875de50cc6fe74b3bf3e (diff) | |
| parent | 8627c7745f47492ab349da6a74e98e3d5813418f (diff) | |
| download | manaplus-de51eaa43e05c2126fc1eef2a7e115843f972547.tar.gz manaplus-de51eaa43e05c2126fc1eef2a7e115843f972547.tar.bz2 manaplus-de51eaa43e05c2126fc1eef2a7e115843f972547.tar.xz manaplus-de51eaa43e05c2126fc1eef2a7e115843f972547.zip | |
Merge branch 'coloritems'
Diffstat (limited to 'src/actorsprite.h')
| -rw-r--r-- | src/actorsprite.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/actorsprite.h b/src/actorsprite.h index 00b694e26..7ec5cc391 100644 --- a/src/actorsprite.h +++ b/src/actorsprite.h @@ -211,7 +211,8 @@ protected: virtual void handleStatusEffect(StatusEffect *effect, int effectId); void setupSpriteDisplay(const SpriteDisplay &display, - bool forceDisplay = true, int imageType = 0); + bool forceDisplay = true, int imageType = 0, + std::string color = ""); int mId; Uint16 mStunMode; /**< Stun mode; zero if not stunned */ |