Skip to content

Actually load model if necessary #7265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BMagnu merged 1 commit into from
Mar 4, 2026
+10 −4
Merged

Actually load model if necessary #7265

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions code/hud/hudshield.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,17 +697,23 @@ void HudGaugeShield::showShields(const object *objp, ShieldGaugeType mode, bool
model_render_params render_info;

// If this comment is here then I have not tested this
int mi = -1;
int model_num = sip->model_num;
int model_instance_number = -1;

if (!config) {
mi = sp->model_instance_num;
render_info.set_replacement_textures(model_get_instance(mi)->texture_replace);
model_instance_number = sp->model_instance_num;
render_info.set_replacement_textures(model_get_instance(model_instance_number)->texture_replace);
}

if (model_num < 0 && config) {
model_num = model_load(sip, false);
}

render_info.set_flags(MR_NO_LIGHTING | MR_AUTOCENTER | MR_NO_FOGGING);
render_info.set_detail_level_lock(1);
render_info.set_object_number(OBJ_INDEX(objp));

model_render_immediate( &render_info, sip->model_num, &object_orient, &vmd_zero_vector );
model_render_immediate( &render_info, model_num, model_instance_number, &object_orient, &vmd_zero_vector );
}

//We're done
Expand Down