Skip to content

Commit

Permalink
Merge pull request scp-fs2open#5764 from Goober5000/tweak_soundtrack_…
Browse files Browse the repository at this point in the history
…warning

two small tweaks
  • Loading branch information
Goober5000 authored Nov 5, 2023
2 parents 2cb12b8 + 1c8a272 commit b861989
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion code/gamesnd/eventmusic.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ void event_music_init()
Warning(LOCATION, "Soundtrack file %s was not found with its specified extension, but another file %s exists in the modpack. Please update the extension and adjust audio specifications if necessary.", filename, res.name_ext.c_str());
#endif

Warning(LOCATION, "One or more files in '%s' could not be loaded. The soundtrack will not be used.", soundtrack.name);
Warning(LOCATION, "Soundtrack file %s was not found. The soundtrack '%s' will not be used.", filename, soundtrack.name);
all_patterns_valid = false;
break;
}
Expand Down
2 changes: 1 addition & 1 deletion code/parse/sexp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38210,7 +38210,7 @@ SCP_vector<sexp_help_struct> Sexp_help = {
{ OP_AI_STAY_NEAR_SHIP, "Ai-stay near ship (Ship goal)\r\n"
"\tCauses the specified ship to park itself near the given ship and move closer if the other ship moves too far "
"away from it.\r\n\r\n"
"Takes 2 to 3 arguments...\r\n"
"Takes 3 to 5 arguments...\r\n"
"\t1:\tName of ship to stay near.\r\n"
"\t2:\tGoal priority (number between 0 and 89).\r\n"
"\t3:\tDistance to stay within (optional; defaults to 300).\r\n"
Expand Down

0 comments on commit b861989

Please sign in to comment.