summaryrefslogtreecommitdiff
path: root/src/being.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-03-03 02:50:03 +0200
committerAndrei Karas <akaras@inbox.ru>2011-03-03 02:50:03 +0200
commitde51eaa43e05c2126fc1eef2a7e115843f972547 (patch)
tree286a05a069e048247f90c7595f1b8939be784608 /src/being.h
parentd4c08d3bf69410a35a50875de50cc6fe74b3bf3e (diff)
parent8627c7745f47492ab349da6a74e98e3d5813418f (diff)
downloadplus-de51eaa43e05c2126fc1eef2a7e115843f972547.tar.gz
plus-de51eaa43e05c2126fc1eef2a7e115843f972547.tar.bz2
plus-de51eaa43e05c2126fc1eef2a7e115843f972547.tar.xz
plus-de51eaa43e05c2126fc1eef2a7e115843f972547.zip
Merge branch 'coloritems'
Diffstat (limited to 'src/being.h')
-rw-r--r--src/being.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/being.h b/src/being.h
index 49127629f..1d5ca7c19 100644
--- a/src/being.h
+++ b/src/being.h
@@ -333,7 +333,8 @@ class Being : public ActorSprite, public ConfigListener
* Sets visible equipments for this being.
*/
void setSprite(unsigned int slot, int id,
- const std::string &color = "", bool isWeapon = false,
+ std::string color = "",
+ unsigned char colorId = 1, bool isWeapon = false,
bool isTempSprite = false);
void setSpriteID(unsigned int slot, int id);