summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-08-22 01:22:47 +0300
committerAndrei Karas <akaras@inbox.ru>2017-08-22 01:22:47 +0300
commitc0b08d3f4f554c16e9a3599f1f1063c3a283bb93 (patch)
tree5e107d7652b6bca48f7349e6f0e746b444774ad6 /src
parente26c01fe66bc698555fdee9d681b3abd6822848a (diff)
downloadplus-c0b08d3f4f554c16e9a3599f1f1063c3a283bb93.tar.gz
plus-c0b08d3f4f554c16e9a3599f1f1063c3a283bb93.tar.bz2
plus-c0b08d3f4f554c16e9a3599f1f1063c3a283bb93.tar.xz
plus-c0b08d3f4f554c16e9a3599f1f1063c3a283bb93.zip
Remove default parameters from ActorSprite::setupSpriteDisplay.
Diffstat (limited to 'src')
-rw-r--r--src/being/actorsprite.h7
-rw-r--r--src/being/being.cpp12
2 files changed, 13 insertions, 6 deletions
diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h
index 75df5342e..ff413f040 100644
--- a/src/being/actorsprite.h
+++ b/src/being/actorsprite.h
@@ -227,10 +227,9 @@ class ActorSprite notfinal : public CompoundSprite, public Actor
const IsStart start);
void setupSpriteDisplay(const SpriteDisplay &display,
- const ForceDisplay forceDisplay
- = ForceDisplay_true,
- const int imageType = 0,
- const std::string &color = "");
+ const ForceDisplay forceDisplay,
+ const int imageType,
+ const std::string &color);
/** Load the target cursors into memory */
static void initTargetCursor();
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 914462892..e43b71600 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -457,14 +457,22 @@ void Being::setSubtype(const BeingTypeId subtype,
mInfo = NPCDB::get(mSubType);
if (mInfo != nullptr)
{
- setupSpriteDisplay(mInfo->getDisplay(), ForceDisplay_false);
+ setupSpriteDisplay(mInfo->getDisplay(),
+ ForceDisplay_false,
+ 0,
+ std::string());
mYDiff = mInfo->getSortOffsetY();
}
break;
case ActorType::Avatar:
mInfo = AvatarDB::get(mSubType);
if (mInfo != nullptr)
- setupSpriteDisplay(mInfo->getDisplay(), ForceDisplay_false);
+ {
+ setupSpriteDisplay(mInfo->getDisplay(),
+ ForceDisplay_false,
+ 0,
+ std::string());
+ }
break;
case ActorType::Player:
{