Merge pull request #36440 from hexagonrecursion/patch-1

Add missing was_loaded initialization
CleverRaven · Dec 26, 2019 · ce7512f · ce7512f
2 parents 2581c93 + a25a2c1
commit ce7512f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/clzones.h b/src/clzones.h
@@ -39,7 +39,7 @@ class zone_type
     public:
 
         zone_type_id id;
-        bool was_loaded;
+        bool was_loaded = false;
 
         zone_type() = default;
         explicit zone_type( const std::string &name, const std::string &desc ) : name_( name ),

diff --git a/src/item_category.h b/src/item_category.h
@@ -14,7 +14,7 @@ class JsonObject;
 
 // this is a helper struct with rules for picking a zone
 struct zone_priority_data {
-    bool was_loaded;
+    bool was_loaded = false;
     zone_type_id id;
     bool filthy = false;
     cata::flat_set<std::string> flags;

diff --git a/src/json.h b/src/json.h
@@ -996,7 +996,7 @@ class JsonArray
     public:
         JsonArray( JsonIn &jsin );
         JsonArray( const JsonArray &ja );
-        JsonArray() : start( 0 ), index( 0 ), end_( 0 ), jsin( nullptr ) {}
+        JsonArray() : start( 0 ), index( 0 ), end_( 0 ), final_separator( false ), jsin( nullptr ) {}
         ~JsonArray() {
             finish();
         }

diff --git a/src/magic_enchantment.h b/src/magic_enchantment.h
@@ -129,7 +129,7 @@ class enchantment
 
         enchantment_id id;
 
-        bool was_loaded;
+        bool was_loaded = false;
 
         void serialize( JsonOut &jsout ) const;