Skip to content

Commit 3a5f714

Browse files
committed
Merge pull request #321 from Goober5000/subsystem_mprintf_fix
the model filename is useful to have in the debug message
2 parents 50feb3e + b2215dd commit 3a5f714

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

code/model/modelread.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -650,12 +650,11 @@ void do_new_subsystem( int n_subsystems, model_subsystem *slist, int subobj_num,
650650
_splitpath(model_filename, NULL, NULL, bname, NULL);
651651
// Lets still give a comment about it and not just erase it
652652
Warning(LOCATION,"Not all subsystems in model \"%s\" have a record in ships.tbl.\nThis can cause game to crash.\n\nList of subsystems not found from table is in log file.\n", model_get(model_num)->filename );
653-
mprintf(("Subsystem %s in model was not found in ships.tbl!\n", subobj_name));
654-
// Warning(LOCATION, "A subsystem was found in model %s that does not have a record in ships.tbl.\nA list of subsystems for this ship will be dumped to:\n\ndata%stables%s%s.subsystems for inclusion\ninto ships.tbl.", model_filename, DIR_SEPARATOR_STR, DIR_SEPARATOR_STR, bname);
653+
mprintf(("Subsystem %s in model %s was not found in ships.tbl!\n", subobj_name, model_get(model_num)->filename));
655654
ss_warning_shown = 1;
656655
} else
657656
#endif
658-
mprintf(("Subsystem %s in model was not found in ships.tbl!\n", subobj_name));
657+
mprintf(("Subsystem %s in model %s was not found in ships.tbl!\n", subobj_name, model_get(model_num)->filename));
659658

660659
#ifndef NDEBUG
661660
if ( ss_fp ) {

0 commit comments

Comments
 (0)