mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-04 02:41:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'race_floats' into 'master'

Browse Source 
Display Race record height/weight as a float

See merge request OpenMW/openmw!880
This commit is contained in:
psi29a 2021-06-19 00:29:21 +00:00
commit afda721d4b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/esm/loadrace.cpp
View File

@ -13,9 +13,9 @@ namespace ESM
return male ? mMale : mFemale; 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) void Race::load(ESMReader &esm, bool &isDeleted)

2
components/esm/loadrace.hpp
View File

@ -38,7 +38,7 @@ struct Race
{ {
float mMale, mFemale; float mMale, mFemale;
int getValue (bool male) const; float getValue (bool male) const;
}; };
enum Flags enum Flags