summaryrefslogtreecommitdiff
path: root/src/actorspritemanager.cpp
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/actorspritemanager.cpp
parentd4c08d3bf69410a35a50875de50cc6fe74b3bf3e (diff)
parent8627c7745f47492ab349da6a74e98e3d5813418f (diff)
downloadmanaplus-de51eaa43e05c2126fc1eef2a7e115843f972547.tar.gz
manaplus-de51eaa43e05c2126fc1eef2a7e115843f972547.tar.bz2
manaplus-de51eaa43e05c2126fc1eef2a7e115843f972547.tar.xz
manaplus-de51eaa43e05c2126fc1eef2a7e115843f972547.zip
Merge branch 'coloritems'
Diffstat (limited to 'src/actorspritemanager.cpp')
-rw-r--r--src/actorspritemanager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp
index 0c5cfe04d..03ed09835 100644
--- a/src/actorspritemanager.cpp
+++ b/src/actorspritemanager.cpp
@@ -190,10 +190,10 @@ Being *ActorSpriteManager::createBeing(int id, ActorSprite::Type type,
return being;
}
-FloorItem *ActorSpriteManager::createItem(int id, int itemId,
- int x, int y, int amount)
+FloorItem *ActorSpriteManager::createItem(int id, int itemId, int x, int y,
+ int amount, unsigned char color)
{
- FloorItem *floorItem = new FloorItem(id, itemId, x, y, mMap, amount);
+ FloorItem *floorItem = new FloorItem(id, itemId, x, y, mMap, amount, color);
mActors.insert(floorItem);
return floorItem;