diff options
author | Travis Howell | 2009-07-12 23:54:46 +0000 |
---|---|---|
committer | Travis Howell | 2009-07-12 23:54:46 +0000 |
commit | 7d1badc5d53c4540cfa82f361f92a151a0f2c078 (patch) | |
tree | 4d84a4de922d68b1b1fdb1459db0d6b16a46155b /engines/sci/engine/ksound.cpp | |
parent | 6e45d0c4aee7d129d6f68013c3f09e8a7087f552 (diff) | |
parent | 3427fb3100c84af0d63c8f8136615489fe0c7d47 (diff) | |
download | scummvm-rg350-7d1badc5d53c4540cfa82f361f92a151a0f2c078.tar.gz scummvm-rg350-7d1badc5d53c4540cfa82f361f92a151a0f2c078.tar.bz2 scummvm-rg350-7d1badc5d53c4540cfa82f361f92a151a0f2c078.zip |
Merged revisions 42398,42402-42406,42418-42421,42423,42428-42430 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
........
r42398 | thebluegr | 2009-07-12 09:45:54 +1000 (Sun, 12 Jul 2009) | 1 line
Moved the kernel and the vocabulary outside of the engine state (they're static data, which never changes during a game)
........
r42402 | sunmax | 2009-07-12 15:34:46 +1000 (Sun, 12 Jul 2009) | 8 lines
Added a temporary work-around for PS2 backend in common/array.h
cause its vintage compiler does not support "new T[newCapacity]()"
but only "new T[newCapacity]", this will let it compile through.
It's ifdef'd as __PLAYSTATION2__, so it won't make a difference
for other backends with more modern tools.
........
r42403 | sunmax | 2009-07-12 15:35:56 +1000 (Sun, 12 Jul 2009) | 5 lines
I am re-commiting the FORCE_RTL as a temporary solution
in trunk, so that trunk/1.0rc is au pair feature-wise
with 0.13.x.
........
r42404 | sunmax | 2009-07-12 15:38:08 +1000 (Sun, 12 Jul 2009) | 24 lines
ScummVM/PS2 bugs fixed by this commit:
- general file write corruption (eg. ScummVM.ini, etc.)
- COMI specific save crash / corruption
(added option in engines/scumm/saveload.cpp to disable
thumbnails on PS2, as emergency fallback in case the
fix should prove to be insufficient)
- implemented _screenChange logic
(fixes grabOverlay & COMI popup menu)
- fixed higher pitch (chipmunk fx)
- made NET IRXs optional to allow it to work on fat PS2 without net+hd
- fixed cursor restore on RTL
- added "." as R2 to skip single lines of dialog
- added write cache
........
r42405 | dreammaster | 2009-07-12 17:23:50 +1000 (Sun, 12 Jul 2009) | 1 line
Added support for sub-relation message types - this fixes trying to attach the chain to the hook on the deck
........
r42406 | lordhoto | 2009-07-12 18:51:57 +1000 (Sun, 12 Jul 2009) | 1 line
Add missing quotation mark to error message.
........
r42418 | lordhoto | 2009-07-13 00:29:59 +1000 (Mon, 13 Jul 2009) | 1 line
Fix typo, which in fact fixes bug #2820353 "GUI: Search doesn't handle uppercase properly".
........
r42419 | knakos | 2009-07-13 01:59:27 +1000 (Mon, 13 Jul 2009) | 1 line
Apply patch 2802544: WINCE: Implement OSystem::engineInit to remove hack
........
r42420 | knakos | 2009-07-13 01:59:56 +1000 (Mon, 13 Jul 2009) | 1 line
fix build with arm-asm routines
........
r42421 | knakos | 2009-07-13 02:40:10 +1000 (Mon, 13 Jul 2009) | 1 line
oops, fix props
........
r42423 | sev | 2009-07-13 04:52:38 +1000 (Mon, 13 Jul 2009) | 2 lines
Patch #1936137: "Speech for Mac BS1 english"
........
r42428 | sunmax | 2009-07-13 07:58:00 +1000 (Mon, 13 Jul 2009) | 6 lines
Split _eof vs. _err.
Latter defaults to false for now, there are hooks
for possible future implementation.
........
r42429 | sunmax | 2009-07-13 08:00:47 +1000 (Mon, 13 Jul 2009) | 4 lines
On PS2 use "fprintf" (as in 0.13.x ) to print error messages to stderr,
rather than "fputs", which is buggy in the PS2 implementation.
........
r42430 | wjpalenstijn | 2009-07-13 08:08:10 +1000 (Mon, 13 Jul 2009) | 1 line
Remove double endline
........
svn-id: r42432
Diffstat (limited to 'engines/sci/engine/ksound.cpp')
-rw-r--r-- | engines/sci/engine/ksound.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp index 95c2eaab1d..8c113d35a3 100644 --- a/engines/sci/engine/ksound.cpp +++ b/engines/sci/engine/ksound.cpp @@ -988,9 +988,9 @@ reg_t kDoSound_SCI1(EngineState *s, int funct_nr, int argc, reg_t *argv) { * Used for synthesized music playback */ reg_t kDoSound(EngineState *s, int funct_nr, int argc, reg_t *argv) { - if (s->_kernel->usesSci1SoundFunctions()) + if (((SciEngine*)g_engine)->getKernel()->usesSci1SoundFunctions()) return kDoSound_SCI1(s, funct_nr, argc, argv); - else if (s->_kernel->usesSci01SoundFunctions()) + else if (((SciEngine*)g_engine)->getKernel()->usesSci01SoundFunctions()) return kDoSound_SCI01(s, funct_nr, argc, argv); else return kDoSound_SCI0(s, funct_nr, argc, argv); |