Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion code/asteroid/asteroid.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1083,8 +1083,10 @@ void asteroid_delete( object * obj )

asp = &Asteroids[num];

if (asp->model_instance_num >= 0)
if (asp->model_instance_num >= 0) {
model_delete_instance(asp->model_instance_num);
asp->model_instance_num = -1;
}

if (asp->target_objnum >= 0) {
for (asteroid_target& target : Asteroid_targets) {
Expand Down
1 change: 1 addition & 0 deletions code/debris/debris.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ void debris_delete( object * obj )

if (db->model_instance_num >= 0) {
model_delete_instance(db->model_instance_num);
db->model_instance_num = -1;
}

if ( db->is_hull ) {
Expand Down
2 changes: 2 additions & 0 deletions code/model/modelrender.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3196,6 +3196,8 @@ void model_render_set_wireframe_color(const color* clr)
void modelinstance_replace_active_texture(polymodel_instance* pmi, const char* old_name, const char* new_name)
{
Assert(pmi != nullptr);
if (pmi == nullptr)
return;
Comment thread
Goober5000 marked this conversation as resolved.
polymodel* pm = model_get(pmi->model_num);

int final_index = -1;
Expand Down
1 change: 1 addition & 0 deletions code/prop/prop.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,7 @@ void prop_delete(object* obj)
propp.glow_point_bank_active.clear();

model_delete_instance(propp.model_instance_num);
propp.model_instance_num = -1;

// Leave the slot empty for the duration of the scene
// The Props array will be compacted at the end of the level
Expand Down
4 changes: 4 additions & 0 deletions code/ship/ship.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8986,12 +8986,16 @@ void ship_delete( object * obj )
ct_ship_delete(shipp);

model_delete_instance(shipp->model_instance_num);
shipp->model_instance_num = -1;

// free up any weapon model instances
for (int i = 0; i < shipp->weapons.num_primary_banks; ++i)
{
if (shipp->weapons.primary_bank_external_model_instance[i] >= 0)
{
model_delete_instance(shipp->weapons.primary_bank_external_model_instance[i]);
shipp->weapons.primary_bank_external_model_instance[i] = -1;
}
}
}

Expand Down
4 changes: 3 additions & 1 deletion code/weapon/weapons.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5336,8 +5336,10 @@ void weapon_delete(object *obj)
if (wp->hud_in_flight_snd_sig.isValid() && snd_is_playing(wp->hud_in_flight_snd_sig))
snd_stop(wp->hud_in_flight_snd_sig);

if (wp->model_instance_num >= 0)
if (wp->model_instance_num >= 0) {
model_delete_instance(wp->model_instance_num);
wp->model_instance_num = -1;
}

if (wp->cmeasure_ignore_list != nullptr) {
delete wp->cmeasure_ignore_list;
Expand Down
Loading