Skip to content

Commit 1cb08e0

Browse files
committed
Merge pull request #450 from asarium/fix/subModelRange
Make this Assert a little more informative
2 parents e117719 + 154a500 commit 1cb08e0

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

code/model/modelread.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4670,9 +4670,10 @@ void model_update_instance(int model_instance_num, int sub_model_num, submodel_i
46704670

46714671
pmi = model_get_instance(model_instance_num);
46724672
pm = model_get(pmi->model_num);
4673-
4674-
Assert( sub_model_num >= 0 );
4675-
Assert( sub_model_num < pm->n_models );
4673+
4674+
Assertion(sub_model_num >= 0 && sub_model_num < pm->n_models,
4675+
"Sub model number (%d) which should be updated is out of range! Must be between 0 and %d. This happend on model %s.",
4676+
sub_model_num, pm->n_models - 1, pm->filename);
46764677

46774678
if ( sub_model_num < 0 ) return;
46784679
if ( sub_model_num >= pm->n_models ) return;

0 commit comments

Comments
 (0)