From 9f3802690f9dd9452e96d1d7a879291978d66e35 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 6 May 2021 14:13:28 -0400 Subject: Refactoring --- src/weapon.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/weapon.h') 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(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(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 getDamage(void) const {return damage;} std::set getProperties(void) const {return properties;} -- cgit v1.2.3