[Scummvm-cvs-logs] SF.net SVN: scummvm:[53904] scummvm/trunk/engines/sci

[thebluegr at users.sourceforge.net]

Revision: 53904
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53904&view=rev
Author:   thebluegr
Date:     2010-10-28 15:27:44 +0000 (Thu, 28 Oct 2010)

Log Message:
-----------
SCI: Fixed compilation and added include safeguards to map-mt32-to-gm.h

Modified Paths:
--------------
    scummvm/trunk/engines/sci/console.cpp
    scummvm/trunk/engines/sci/sound/drivers/map-mt32-to-gm.h

Modified: scummvm/trunk/engines/sci/console.cpp
===================================================================
--- scummvm/trunk/engines/sci/console.cpp	2010-10-28 13:00:21 UTC (rev 53903)
+++ scummvm/trunk/engines/sci/console.cpp	2010-10-28 15:27:44 UTC (rev 53904)
@@ -1051,7 +1051,6 @@
 		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;

Modified: scummvm/trunk/engines/sci/sound/drivers/map-mt32-to-gm.h
===================================================================
--- scummvm/trunk/engines/sci/sound/drivers/map-mt32-to-gm.h	2010-10-28 13:00:21 UTC (rev 53903)
+++ scummvm/trunk/engines/sci/sound/drivers/map-mt32-to-gm.h	2010-10-28 15:27:44 UTC (rev 53904)
@@ -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 @@
 	extern Mt32ToGmMapList *Mt32dynamicMappings;
 
 } // End of namespace Sci
+
+#endif // SCI_SOUND_DRIVERS_MAP_MT32_TO_GM_H


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.