summaryrefslogtreecommitdiff
path: root/src/being/actorsprite.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-03-23 21:03:27 +0300
committerAndrei Karas <akaras@inbox.ru>2016-03-23 21:03:27 +0300
commit4b807a6184b3fcd9ba3df5d96f199917d88adc82 (patch)
treea62e22d2b53476f4fbe54040f262a86746e393b6 /src/being/actorsprite.h
parent4a0aa65d1b215f8f51c6ff5a0a048f9898be6cd0 (diff)
downloadmv-4b807a6184b3fcd9ba3df5d96f199917d88adc82.tar.gz
mv-4b807a6184b3fcd9ba3df5d96f199917d88adc82.tar.bz2
mv-4b807a6184b3fcd9ba3df5d96f199917d88adc82.tar.xz
mv-4b807a6184b3fcd9ba3df5d96f199917d88adc82.zip
Add status effect id type from int to int32_t.
Diffstat (limited to 'src/being/actorsprite.h')
-rw-r--r--src/being/actorsprite.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h
index 25e7c446a..0eac9807d 100644
--- a/src/being/actorsprite.h
+++ b/src/being/actorsprite.h
@@ -107,7 +107,8 @@ class ActorSprite notfinal : public CompoundSprite, public Actor
void untarget()
{ mUsedTargetCursor = nullptr; }
- void setStatusEffect(const int index, const Enable active);
+ void setStatusEffect(const int32_t index,
+ const Enable active);
void setStatusEffectOpitons(const uint32_t option,
const uint32_t opt1,
@@ -173,7 +174,7 @@ class ActorSprite notfinal : public CompoundSprite, public Actor
bool isTrickDead() const A_WARN_UNUSED
{ return mTrickDead; }
- const std::set<int> &getStatusEffects() const A_WARN_UNUSED
+ const std::set<int32_t> &getStatusEffects() const A_WARN_UNUSED
{ return mStatusEffects; }
std::string getStatusEffectsString() const;
@@ -188,13 +189,14 @@ class ActorSprite notfinal : public CompoundSprite, public Actor
*
* These are NOT the same as the status effect indices.
*/
- void setStatusEffectBlock(const int offset, const uint16_t flags);
+ void setStatusEffectBlock(const int offset,
+ const uint16_t flags);
/**
* Notify self that a status effect has flipped.
* The new flag is passed.
*/
- virtual void updateStatusEffect(const int index,
+ virtual void updateStatusEffect(const int32_t index,
const Enable newStatus);
/**
@@ -204,7 +206,7 @@ class ActorSprite notfinal : public CompoundSprite, public Actor
* \param effectId -1 for stun, otherwise the effect index
*/
virtual void handleStatusEffect(const StatusEffect *const effect,
- const int effectId);
+ const int32_t effectId);
void setupSpriteDisplay(const SpriteDisplay &display,
const ForceDisplay forceDisplay
@@ -225,7 +227,8 @@ class ActorSprite notfinal : public CompoundSprite, public Actor
static bool loaded;
- std::set<int> mStatusEffects; /**< set of active status effects */
+ /**< set of active status effects */
+ std::set<int32_t> mStatusEffects;
ParticleVector mStatusParticleEffects;
ParticleList mChildParticleEffects;