mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-01 03:21:41 +00:00
Merge branch 'race_floats' into 'master'
Display Race record height/weight as a float See merge request OpenMW/openmw!880
This commit is contained in:
commit
afda721d4b
@ -13,9 +13,9 @@ namespace ESM
|
||||
return male ? mMale : mFemale;
|
||||
}
|
||||
|
||||
int Race::MaleFemaleF::getValue (bool male) const
|
||||
float Race::MaleFemaleF::getValue (bool male) const
|
||||
{
|
||||
return static_cast<int>(male ? mMale : mFemale);
|
||||
return male ? mMale : mFemale;
|
||||
}
|
||||
|
||||
void Race::load(ESMReader &esm, bool &isDeleted)
|
||||
|
@ -38,7 +38,7 @@ struct Race
|
||||
{
|
||||
float mMale, mFemale;
|
||||
|
||||
int getValue (bool male) const;
|
||||
float getValue (bool male) const;
|
||||
};
|
||||
|
||||
enum Flags
|
||||
|
Loading…
Reference in New Issue
Block a user