diff options
| author | Norbert Lange | 2009-08-24 17:51:47 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-08-24 17:51:47 +0000 |
| commit | 917d4b78b36d6c5a5c25a03e7ee6a1c1b6a85fd5 (patch) | |
| tree | e652563203a00f8acecfaafbf93c64dbfbd13f25 /sound/mods | |
| parent | 5f87d5090cfcb34cda3c1f5d430e0865344d7366 (diff) | |
| parent | dd7868acc2512c9761d892e67a4837f4dc38bdc0 (diff) | |
| download | scummvm-rg350-917d4b78b36d6c5a5c25a03e7ee6a1c1b6a85fd5.tar.gz scummvm-rg350-917d4b78b36d6c5a5c25a03e7ee6a1c1b6a85fd5.tar.bz2 scummvm-rg350-917d4b78b36d6c5a5c25a03e7ee6a1c1b6a85fd5.zip | |
Merge with trunk
svn-id: r43701
Diffstat (limited to 'sound/mods')
| -rw-r--r-- | sound/mods/maxtrax.cpp | 2 | ||||
| -rw-r--r-- | sound/mods/tfmx.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/mods/maxtrax.cpp b/sound/mods/maxtrax.cpp index 1cdbdcc24c..90ac3d55ca 100644 --- a/sound/mods/maxtrax.cpp +++ b/sound/mods/maxtrax.cpp @@ -983,7 +983,7 @@ allocError: if (!errorMsg) errorMsg = "Maxtrax: Could not allocate Memory"; - warning(errorMsg); + warning("%s", errorMsg); if (loadSamples) freePatches(); if (loadScores) diff --git a/sound/mods/tfmx.cpp b/sound/mods/tfmx.cpp index a7490c3f86..2ef7d79b7a 100644 --- a/sound/mods/tfmx.cpp +++ b/sound/mods/tfmx.cpp @@ -1097,7 +1097,7 @@ int Tfmx::doSfx(uint16 sfxIndex, bool unlockChannel) { // some debugging functions namespace { -#ifndef NDEBUG +#if !defined(NDEBUG) && 0 void displayMacroStep(const void *const vptr) { const char *tableMacros[] = { "DMAoff+Resetxx/xx/xx flag/addset/vol ", |