diff options
author | Daniel Bradshaw <daniel+commits@the-cell.co.uk> | 2010-01-26 21:02:20 +0000 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-01-28 10:19:12 +0100 |
commit | ca2950fb8bffa9924aa49ab1d4729dbc2a391752 (patch) | |
tree | d95f92db525f415a4107ed8704b75368b70da967 /src/units.cpp | |
parent | 8d299d86c1209be6084e0d78c0454c946874e00f (diff) | |
download | mana-ca2950fb8bffa9924aa49ab1d4729dbc2a391752.tar.gz mana-ca2950fb8bffa9924aa49ab1d4729dbc2a391752.tar.bz2 mana-ca2950fb8bffa9924aa49ab1d4729dbc2a391752.tar.xz mana-ca2950fb8bffa9924aa49ab1d4729dbc2a391752.zip |
Added virtual destructors, some implicit casts, and a couple of type changes.
Many warnings removed.
Reviewed-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
Diffstat (limited to 'src/units.cpp')
-rw-r--r-- | src/units.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/units.cpp b/src/units.cpp index ac252fcd..57be9a59 100644 --- a/src/units.cpp +++ b/src/units.cpp @@ -107,7 +107,7 @@ void Units::loadUnits() struct UnitDescription ud; int level = 1; const std::string type = XML::getProperty(node, "type", ""); - ud.conversion = XML::getProperty(node, "conversion", 1.0); + ud.conversion = XML::getProperty(node, "conversion", 1); ud.mix = XML::getProperty(node, "mix", "no") == "yes"; struct UnitLevel bu; |