summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-29 20:59:14 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-29 20:59:14 +0300
commit390e5da0f9ecc4407aa7d4bcba1af5730db56271 (patch)
treeee0879cba3fec38740f1e51f2d1d35719ec3d8ae /src/being
parent9f1994182d4225f630a93ae06b01927c4f7a9a37 (diff)
downloadplus-390e5da0f9ecc4407aa7d4bcba1af5730db56271.tar.gz
plus-390e5da0f9ecc4407aa7d4bcba1af5730db56271.tar.bz2
plus-390e5da0f9ecc4407aa7d4bcba1af5730db56271.tar.xz
plus-390e5da0f9ecc4407aa7d4bcba1af5730db56271.zip
Convert AttackType enum into strong typed enum.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/being.cpp6
-rw-r--r--src/being/being.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 1362c904a..947e98fb6 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -587,7 +587,7 @@ void Being::setSpeech(const std::string &text, const std::string &channel,
void Being::takeDamage(Being *const attacker,
const int amount,
- const AttackType::Type type,
+ const AttackTypeT type,
const int attackId,
const int level)
{
@@ -770,7 +770,7 @@ void Being::takeDamage(Being *const attacker,
}
int Being::getHitEffect(const Being *const attacker,
- const AttackType::Type type,
+ const AttackTypeT type,
const int attackId,
const int level) const
{
@@ -850,7 +850,7 @@ int Being::getHitEffect(const Being *const attacker,
return hitEffectId;
}
-int Being::getDefaultEffectId(const AttackType::Type &type)
+int Being::getDefaultEffectId(const AttackTypeT &type)
{
if (type == AttackType::MISS)
return paths.getIntValue("missEffectId");
diff --git a/src/being/being.h b/src/being/being.h
index b1639f250..83ca7785a 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -189,7 +189,7 @@ class Being notfinal : public ActorSprite,
*/
void takeDamage(Being *const attacker,
const int damage,
- const AttackType::Type type,
+ const AttackTypeT type,
const int attackId = 1,
const int level = 1);
@@ -793,7 +793,7 @@ class Being notfinal : public ActorSprite,
void recalcSpritesOrder();
int getHitEffect(const Being *const attacker,
- const AttackType::Type type,
+ const AttackTypeT type,
const int attackId,
const int level) const A_WARN_UNUSED;
@@ -938,7 +938,7 @@ class Being notfinal : public ActorSprite,
void createSpeechBubble();
- static int getDefaultEffectId(const AttackType::Type &type);
+ static int getDefaultEffectId(const AttackTypeT &type);
BeingInfo *mInfo;
AnimatedSprite *mEmotionSprite;