diff --git a/common/main/morph.h b/common/main/morph.h index 38b466bb0..ec228458d 100644 --- a/common/main/morph.h +++ b/common/main/morph.h @@ -45,12 +45,12 @@ struct morph_data : prohibit_void_ptr { MAX_VECS = 5000, }; - object *obj; // object which is morphing - int n_submodels_active; + object *obj = nullptr; // object which is morphing + uint8_t n_submodels_active; uint8_t morph_save_control_type; uint8_t morph_save_movement_type; - physics_info morph_save_phys_info; object_signature_t Morph_sig; + physics_info morph_save_phys_info; array morph_vecs, morph_deltas; array morph_times; array submodel_active, // which submodels are active