Fix division by 0

CleverRaven · May 5, 2020 · 68a109c · 68a109c
1 parent e236187
commit 68a109c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/data/json/bionics.json b/data/json/bionics.json
@@ -608,6 +608,7 @@
     "occupied_bodyparts": [ [ "HAND_R", 1 ] ],
     "act_cost": "30 kJ",
     "fake_item": "bio_laser_gun",
+"capacity": "50 kJ",
     "flags": [ "BIONIC_GUN", "BIONIC_NPC_USABLE" ]
   },
   {

diff --git a/src/bionics.cpp b/src/bionics.cpp
@@ -264,7 +264,7 @@ void bionic_data::load( const JsonObject &jsobj, const std::string )
 
     optional( jsobj, was_loaded, "enchantments", enchantments );
 
-    optional( jsobj, was_loaded, "weight_capacity_modifier", weight_capacity_modifier, 1.0 );
+    optional( jsobj, was_loaded, "weight_capacity_modifier", weight_capacity_modifier, 1.0f );
     optional( jsobj, was_loaded, "exothermic_power_gen", exothermic_power_gen );
     optional( jsobj, was_loaded, "power_gen_emission", power_gen_emission );
     optional( jsobj, was_loaded, "coverage_power_gen_penalty", coverage_power_gen_penalty );

diff --git a/src/bionics.h b/src/bionics.h
@@ -51,7 +51,7 @@ struct bionic_data {
     */
     bool included = false;
     /**Factor modifiying weight capacity*/
-    float weight_capacity_modifier = 0.0f;
+    float weight_capacity_modifier = 1.0f;
     /**Bonus to weight capacity*/
     units::mass weight_capacity_bonus = 0_gram;
     /**Map of stats and their corresponding bonuses passively granted by a bionic*/