Merge branch 'race_floats' into 'master'

Display Race record height/weight as a float See merge request OpenMW/openmw!880
4 years ago · afda721d4b
parent 047d993cf4 41cfcfdc0f
commit afda721d4b
2 changed files with 3 additions and 3 deletions
--- a/components/esm/loadrace.cpp
+++ b/components/esm/loadrace.cpp
@ -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)
--- a/components/esm/loadrace.hpp
+++ b/components/esm/loadrace.hpp
@ -38,7 +38,7 @@ struct Race
    {
        float mMale, mFemale;

-        int getValue (bool male) const;
+        float getValue (bool male) const;
    };

    enum Flags