diff options
| author | Filippos Karapetis | 2010-10-28 15:27:44 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-10-28 15:27:44 +0000 |
| commit | 0e7444a4638e32292ae00bcba8d8394bd4e22481 (patch) | |
| tree | 9238dcaa0243f9583d790fc60a01f2e57972997a /engines/sci | |
| parent | a7b5133903ef4a50a52b5d6ecd5264ec6e69b62c (diff) | |
| download | scummvm-rg350-0e7444a4638e32292ae00bcba8d8394bd4e22481.tar.gz scummvm-rg350-0e7444a4638e32292ae00bcba8d8394bd4e22481.tar.bz2 scummvm-rg350-0e7444a4638e32292ae00bcba8d8394bd4e22481.zip | |
SCI: Fixed compilation and added include safeguards to map-mt32-to-gm.h
svn-id: r53904
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/console.cpp | 1 | ||||
| -rw-r--r-- | engines/sci/sound/drivers/map-mt32-to-gm.h | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp index 8ad144e1f8..ac9f9f5520 100644 --- a/engines/sci/console.cpp +++ b/engines/sci/console.cpp @@ -1051,7 +1051,6 @@ bool Console::cmdMapInstrument(int argc, const char **argv) { DebugPrintf("Please replace the spaces in the instrument name with underscores (\"_\"). They'll be converted to spaces afterwards\n\n"); DebugPrintf("Example: %s test_0__XX 1 255\n", argv[0]); DebugPrintf("The above example will map the MT-32 instument \"test 0 XX\" to GM instrument 1\n\n"); - Example } else { if (Mt32dynamicMappings != NULL) { Mt32ToGmMap newMapping; diff --git a/engines/sci/sound/drivers/map-mt32-to-gm.h b/engines/sci/sound/drivers/map-mt32-to-gm.h index 44103973ab..4892863b97 100644 --- a/engines/sci/sound/drivers/map-mt32-to-gm.h +++ b/engines/sci/sound/drivers/map-mt32-to-gm.h @@ -23,6 +23,9 @@ * */ +#ifndef SCI_SOUND_DRIVERS_MAP_MT32_TO_GM_H +#define SCI_SOUND_DRIVERS_MAP_MT32_TO_GM_H + namespace Sci { #include "common/list.h" @@ -557,3 +560,5 @@ static const Mt32ToGmMap Mt32MemoryTimbreMaps[] = { extern Mt32ToGmMapList *Mt32dynamicMappings; } // End of namespace Sci + +#endif // SCI_SOUND_DRIVERS_MAP_MT32_TO_GM_H |