[Scummvm-cvs-logs] SF.net SVN: scummvm:[50721] scummvm/trunk/engines/sci/engine/kmenu.cpp
m_kiewitz at users.sourceforge.net
m_kiewitz at users.sourceforge.net
Tue Jul 6 13:16:11 CEST 2010
Revision: 50721
http://scummvm.svn.sourceforge.net/scummvm/?rev=50721&view=rev
Author: m_kiewitz
Date: 2010-07-06 11:16:11 +0000 (Tue, 06 Jul 2010)
Log Message:
-----------
SCI: implemented pauseSound inside kMenuSelect
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/kmenu.cpp
Modified: scummvm/trunk/engines/sci/engine/kmenu.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmenu.cpp 2010-07-06 11:03:10 UTC (rev 50720)
+++ scummvm/trunk/engines/sci/engine/kmenu.cpp 2010-07-06 11:16:11 UTC (rev 50721)
@@ -90,10 +90,17 @@
reg_t kMenuSelect(EngineState *s, int argc, reg_t *argv) {
reg_t eventObject = argv[0];
- //bool pauseSound = argc > 1 ? (argv[1].isNull() ? false : true) : false;
+ bool pauseSound = argc > 1 ? (argv[1].isNull() ? false : true) : true;
+ reg_t result;
- // TODO: pauseSound implementation
- return g_sci->_gfxMenu->kernelSelect(eventObject);
+ if (pauseSound)
+ g_sci->_soundCmd->pauseAll(true);
+
+ result = g_sci->_gfxMenu->kernelSelect(eventObject);
+
+ if (pauseSound)
+ g_sci->_soundCmd->pauseAll(false);
+ return result;
}
} // End of namespace Sci
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