diff options
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;} |