aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2010-08-03 11:25:20 +0000
committerEugene Sandulenko2010-08-03 11:25:20 +0000
commit02cca98ed6fce6d7aced41974eaf2fd1622f207c (patch)
tree6f254e71ba2cc7daaad59036119def095693df78
parent0437ffa75c510f0bb8a3a5cd580b79008446522e (diff)
downloadscummvm-rg350-02cca98ed6fce6d7aced41974eaf2fd1622f207c.tar.gz
scummvm-rg350-02cca98ed6fce6d7aced41974eaf2fd1622f207c.tar.bz2
scummvm-rg350-02cca98ed6fce6d7aced41974eaf2fd1622f207c.zip
SCUMM: Add posibility to disable NES APU which is CPU demanding
svn-id: r51679
-rw-r--r--engines/scumm/player_nes.cpp3
-rw-r--r--engines/scumm/scumm.cpp2
2 files changed, 5 insertions, 0 deletions
diff --git a/engines/scumm/player_nes.cpp b/engines/scumm/player_nes.cpp
index 4618de3175..96396e7a08 100644
--- a/engines/scumm/player_nes.cpp
+++ b/engines/scumm/player_nes.cpp
@@ -23,6 +23,7 @@
*
*/
+#ifndef DISABLE_NES_APU
#include "engines/engine.h"
#include "scumm/player_nes.h"
@@ -1065,3 +1066,5 @@ byte Player_NES::APU_readStatus() {
}
} // End of namespace Scumm
+
+#endif // DISABLE_NES_APU
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index b44184f5cb..fc95060b6f 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1723,7 +1723,9 @@ void ScummEngine::setupMusic(int midi) {
_musicEngine = new Player_SID(this, _mixer);
#endif
} else if (_game.platform == Common::kPlatformNES && _game.version == 1) {
+#ifndef DISABLE_NES_APU
_musicEngine = new Player_NES(this, _mixer);
+#endif
} else if (_game.platform == Common::kPlatformAmiga && _game.version == 2) {
_musicEngine = new Player_V2A(this, _mixer);
} else if (_game.platform == Common::kPlatformAmiga && _game.version == 3) {