From 741eb87f4b494812fab9573fe9d4b5d0c2db3498 Mon Sep 17 00:00:00 2001 From: Johannes Schultz Date: Sun, 1 Dec 2024 11:37:48 +0000 Subject: [PATCH] Merged revision(s) 22381 from trunk/OpenMPT: [Ref] Avoid warnings in !MPT_EXTERNAL_SAMPLES mode. ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.30@22383 56274372-70c3-4bfc-bfc3-4c3a0b034d27 --- soundlib/Load_mod.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soundlib/Load_mod.cpp b/soundlib/Load_mod.cpp index bfc57c83d2..4cc83fb0d1 100644 --- a/soundlib/Load_mod.cpp +++ b/soundlib/Load_mod.cpp @@ -1313,13 +1313,13 @@ bool CSoundFile::ReadMOD(FileReader &file, ModLoadingFlags loadFlags) { if(++emptySampleReferences > 1) { +#ifdef MPT_EXTERNAL_SAMPLES mpt::ustring filenameHint; if(file.GetOptionalFileName()) { const auto filename = file.GetOptionalFileName()->GetFilename().ToUnicode(); filenameHint = MPT_UFORMAT(" ({}.nt or {}.as)")(filename, filename); } -#ifdef MPT_EXTERNAL_SAMPLES AddToLog(LogWarning, MPT_UFORMAT("This Startrekker AM file is most likely missing its companion file{}. Synthesized instruments will not play.")(filenameHint)); #else AddToLog(LogWarning, U_("This appears to be a Startrekker AM file with external synthesizes instruments. External instruments are currently not supported."));