Skip to content

Commit 5fc84d5

Browse files
authored
Actually load model if necessary (scp-fs2open#7265)
1 parent ffa1bb2 commit 5fc84d5

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

code/hud/hudshield.cpp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -697,17 +697,23 @@ void HudGaugeShield::showShields(const object *objp, ShieldGaugeType mode, bool
697697
model_render_params render_info;
698698

699699
// If this comment is here then I have not tested this
700-
int mi = -1;
700+
int model_num = sip->model_num;
701+
int model_instance_number = -1;
702+
701703
if (!config) {
702-
mi = sp->model_instance_num;
703-
render_info.set_replacement_textures(model_get_instance(mi)->texture_replace);
704+
model_instance_number = sp->model_instance_num;
705+
render_info.set_replacement_textures(model_get_instance(model_instance_number)->texture_replace);
706+
}
707+
708+
if (model_num < 0 && config) {
709+
model_num = model_load(sip, false);
704710
}
705711

706712
render_info.set_flags(MR_NO_LIGHTING | MR_AUTOCENTER | MR_NO_FOGGING);
707713
render_info.set_detail_level_lock(1);
708714
render_info.set_object_number(OBJ_INDEX(objp));
709715

710-
model_render_immediate( &render_info, sip->model_num, &object_orient, &vmd_zero_vector );
716+
model_render_immediate( &render_info, model_num, model_instance_number, &object_orient, &vmd_zero_vector );
711717
}
712718

713719
//We're done

0 commit comments

Comments
 (0)