diff options
| author | Your Name <you@example.com> | 2021-05-06 14:13:28 -0400 |
|---|---|---|
| committer | Your Name <you@example.com> | 2021-05-06 14:13:28 -0400 |
| commit | 9f3802690f9dd9452e96d1d7a879291978d66e35 (patch) | |
| tree | 6d6c17b39abdb9490119241bc4fc061744b46d7d /src/weapon.h | |
| parent | 2a9f262e6db5906db445d465e500d7ba8c90fab3 (diff) | |
| download | dmtool-9f3802690f9dd9452e96d1d7a879291978d66e35.tar.gz dmtool-9f3802690f9dd9452e96d1d7a879291978d66e35.tar.bz2 dmtool-9f3802690f9dd9452e96d1d7a879291978d66e35.zip | |
Refactoring
Diffstat (limited to 'src/weapon.h')
| -rw-r--r-- | src/weapon.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/weapon.h b/src/weapon.h index 9384f78..c1047bb 100644 --- a/src/weapon.h +++ b/src/weapon.h @@ -38,7 +38,7 @@ namespace entry { class Weapon : public Item, public Substantial { public: - Weapon(const nlohmann::json& data, const nlohmann::json& base) : Item(base), damage(json2vec<Damage>(data["damage"])), properties(data["properties"]), weaponType(data["weapon_type"]), range(data["range"][0], data["range"][1]), reach(data["reach"]), cost(data["cost"]), weight(data["weight"]) {} + Weapon(const nlohmann::json& data, const nlohmann::json& base) : Item(base), damage(utils::json2vec<Damage>(data["damage"])), properties(data["properties"]), weaponType(data["weapon_type"]), range(data["range"][0], data["range"][1]), reach(data["reach"]), cost(data["cost"]), weight(data["weight"]) {} std::vector<Damage> getDamage(void) const {return damage;} std::set<std::string> getProperties(void) const {return properties;} |