diff options
author | Max Horn | 2009-06-04 21:44:39 +0000 |
---|---|---|
committer | Max Horn | 2009-06-04 21:44:39 +0000 |
commit | 10c54394bd2f97a6a59a4fc1aedfcad09c40f1dc (patch) | |
tree | 06064a5a492015e1f79f3a3b8d2129c39346aa1f /engines/sci/engine/ksound.cpp | |
parent | 870db34cd1e435891e02f54c1c0dc013f257135d (diff) | |
download | scummvm-rg350-10c54394bd2f97a6a59a4fc1aedfcad09c40f1dc.tar.gz scummvm-rg350-10c54394bd2f97a6a59a4fc1aedfcad09c40f1dc.tar.bz2 scummvm-rg350-10c54394bd2f97a6a59a4fc1aedfcad09c40f1dc.zip |
SCI: Renamed EngineState::flags and version to _flags and _version (following our conventions); also slightly changed the EngineState constructor to init _version & _flags, and used this to make them constant
svn-id: r41177
Diffstat (limited to 'engines/sci/engine/ksound.cpp')
-rw-r--r-- | engines/sci/engine/ksound.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp index 3586b6b1ed..b0fbda36f9 100644 --- a/engines/sci/engine/ksound.cpp +++ b/engines/sci/engine/ksound.cpp @@ -154,7 +154,7 @@ void process_sound_events(EngineState *s) { /* Get all sound events, apply their song_handle_t handle; int cue; - if (s->version >= SCI_VERSION_01) + if (s->_version >= SCI_VERSION_01) return; /* SCI01 and later explicitly poll for everything */ @@ -964,9 +964,9 @@ reg_t kDoSound_SCI1(EngineState *s, int funct_nr, int argc, reg_t *argv) { } reg_t kDoSound(EngineState *s, int funct_nr, int argc, reg_t *argv) { - if (s->version >= SCI_VERSION_1_1 || s->flags & GF_SCI1_NEWDOSOUND) + if (s->_version >= SCI_VERSION_1_1 || s->_flags & GF_SCI1_NEWDOSOUND) return kDoSound_SCI1(s, funct_nr, argc, argv); - else if (s->version >= SCI_VERSION_01) + else if (s->_version >= SCI_VERSION_01) return kDoSound_SCI01(s, funct_nr, argc, argv); else return kDoSound_SCI0(s, funct_nr, argc, argv); @@ -978,7 +978,7 @@ reg_t kDoAudio(EngineState *s, int funct_nr, int argc, reg_t *argv) { int sampleLen = 0; if (!s->_sound._audioResource) - s->_sound._audioResource = new AudioResource(s->resmgr, s->version); + s->_sound._audioResource = new AudioResource(s->resmgr, s->_version); switch (UKPV(0)) { case kSciAudioWPlay: |