diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-05-13 12:56:09 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-05-13 12:56:09 +0300 |
commit | 7b4b302ffe79cdba0fa35b66741a9d6c3d9184f2 (patch) | |
tree | 1be01271ab942e0e6e321fa2ce45a6b527f97b07 /src/resources | |
parent | ea0b61e18f36f28806940b00a2cddaef912c3340 (diff) | |
download | mv-7b4b302ffe79cdba0fa35b66741a9d6c3d9184f2.tar.gz mv-7b4b302ffe79cdba0fa35b66741a9d6c3d9184f2.tar.bz2 mv-7b4b302ffe79cdba0fa35b66741a9d6c3d9184f2.tar.xz mv-7b4b302ffe79cdba0fa35b66741a9d6c3d9184f2.zip |
Move targetcursorsize into separate file.
Diffstat (limited to 'src/resources')
-rw-r--r-- | src/resources/beinginfo.cpp | 10 | ||||
-rw-r--r-- | src/resources/beinginfo.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp index f13055b49..5cf6b2397 100644 --- a/src/resources/beinginfo.cpp +++ b/src/resources/beinginfo.cpp @@ -42,7 +42,7 @@ BeingInfo::BeingInfo() : mDisplay(), // TRANSLATORS: being info default name mName(_("unnamed")), - mTargetCursorSize(ActorSprite::TC_MEDIUM), + mTargetCursorSize(TargetCursorSize::MEDIUM), mHoverCursor(Cursor::CURSOR_POINTER), mSounds(), mAttacks(), @@ -106,21 +106,21 @@ void BeingInfo::setTargetCursorSize(const std::string &size) { if (size == "small") { - setTargetCursorSize(ActorSprite::TC_SMALL); + setTargetCursorSize(TargetCursorSize::SMALL); } else if (size == "medium") { - setTargetCursorSize(ActorSprite::TC_MEDIUM); + setTargetCursorSize(TargetCursorSize::MEDIUM); } else if (size == "large") { - setTargetCursorSize(ActorSprite::TC_LARGE); + setTargetCursorSize(TargetCursorSize::LARGE); } else { logger->log("Unknown target cursor type \"%s\" for %s - using medium " "sized one", size.c_str(), getName().c_str()); - setTargetCursorSize(ActorSprite::TC_MEDIUM); + setTargetCursorSize(TargetCursorSize::MEDIUM); } } diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h index 554b1efaf..f76a08cc6 100644 --- a/src/resources/beinginfo.h +++ b/src/resources/beinginfo.h @@ -95,7 +95,7 @@ class BeingInfo final void setTargetCursorSize(const std::string &size); - void setTargetCursorSize(const ActorSprite::TargetCursorSize + void setTargetCursorSize(const TargetCursorSize::Size &targetSize) { mTargetCursorSize = targetSize; } @@ -108,7 +108,7 @@ class BeingInfo final Cursor::Cursor getHoverCursor() const A_WARN_UNUSED { return mHoverCursor; } - ActorSprite::TargetCursorSize getTargetCursorSize() const A_WARN_UNUSED + TargetCursorSize::Size getTargetCursorSize() const A_WARN_UNUSED { return mTargetCursorSize; } void addSound(const ItemSoundEvent event, const std::string &filename, @@ -341,7 +341,7 @@ class BeingInfo final private: SpriteDisplay mDisplay; std::string mName; - ActorSprite::TargetCursorSize mTargetCursorSize; + TargetCursorSize::Size mTargetCursorSize; Cursor::Cursor mHoverCursor; ItemSoundEvents mSounds; Attacks mAttacks; |