diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-12-29 17:57:13 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-12-29 17:57:13 +0300 |
commit | 30c8e376a1c45043863e6ad8b04186eabb711487 (patch) | |
tree | 25acbe8618de339638c3735193ed9b15ff740536 /src/being/being.h | |
parent | 11f9e4c95d1e30005240f6e00204faa93bb315db (diff) | |
download | mv-30c8e376a1c45043863e6ad8b04186eabb711487.tar.gz mv-30c8e376a1c45043863e6ad8b04186eabb711487.tar.bz2 mv-30c8e376a1c45043863e6ad8b04186eabb711487.tar.xz mv-30c8e376a1c45043863e6ad8b04186eabb711487.zip |
Add constexpr into being.
Diffstat (limited to 'src/being/being.h')
-rw-r--r-- | src/being/being.h | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/src/being/being.h b/src/being/being.h index b35c550bd..121618880 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -908,9 +908,36 @@ class Being notfinal : public ActorSprite, void setLook(const uint16_t look) restrict2; - static uint8_t genderToInt(const GenderT sex) A_CONST A_WARN_UNUSED; + constexpr2 static uint8_t genderToInt(const GenderT sex) + A_CONST A_WARN_UNUSED + { + switch (sex) + { + case Gender::FEMALE: + case Gender::UNSPECIFIED: + default: + return 0; + case Gender::MALE: + return 1; + case Gender::OTHER: + return 3; + } + } - static GenderT intToGender(const uint8_t sex) A_CONST A_WARN_UNUSED; + constexpr2 static GenderT intToGender(const uint8_t sex) + A_CONST A_WARN_UNUSED + { + switch (sex) + { + case 0: + default: + return Gender::FEMALE; + case 1: + return Gender::MALE; + case 3: + return Gender::OTHER; + } + } NextSoundInfo mNextSound; |