[Scummvm-cvs-logs] SF.net SVN: scummvm:[46749] scummvm/trunk/engines/saga/resource.cpp
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Wed Dec 30 16:24:18 CET 2009
Revision: 46749
http://scummvm.svn.sourceforge.net/scummvm/?rev=46749&view=rev
Author: thebluegr
Date: 2009-12-30 15:24:16 +0000 (Wed, 30 Dec 2009)
Log Message:
-----------
Wrapped some IHNM-specific code around appropriate ifdef's
Modified Paths:
--------------
scummvm/trunk/engines/saga/resource.cpp
Modified: scummvm/trunk/engines/saga/resource.cpp
===================================================================
--- scummvm/trunk/engines/saga/resource.cpp 2009-12-30 15:08:40 UTC (rev 46748)
+++ scummvm/trunk/engines/saga/resource.cpp 2009-12-30 15:24:16 UTC (rev 46749)
@@ -315,16 +315,20 @@
}
if (_voicesFileName[0][0] == 0) {
+#ifdef ENABLE_IHNM
if (_vm->getGameId() == GID_IHNM && _vm->isMacResources()) {
// The Macintosh version of IHNM has no voices.res, and it has all
// its voice files in subdirectories, so don't do anything here
_contexts.push_back(new VoiceResourceContext_RES());
} else {
+#endif
warning("No voice file found, voices will be disabled");
_vm->_voicesEnabled = false;
_vm->_subtitlesEnabled = true;
_vm->_voiceFilesExist = false;
+#ifdef ENABLE_IHNM
}
+#endif
}
//// Detect and add music files /////////////////////////////////////////
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list