diff options
| author | Filippos Karapetis | 2009-08-25 08:38:14 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-08-25 08:38:14 +0000 |
| commit | ed66cad6777a779f5cabeec037a24613da0134bf (patch) | |
| tree | a63032758b32e3ada2ec0287033edfc5a17ee1c3 /engines/sci/sfx/core.h | |
| parent | bc20237ae37cf042a0f7c2c49cd0ca68ef76379b (diff) | |
| download | scummvm-rg350-ed66cad6777a779f5cabeec037a24613da0134bf.tar.gz scummvm-rg350-ed66cad6777a779f5cabeec037a24613da0134bf.tar.bz2 scummvm-rg350-ed66cad6777a779f5cabeec037a24613da0134bf.zip | |
- Simplified the parameters of some functions
- Replaced some EngineState parameters
- The SCI version is now obtained from the resource manager or the segment manager, thereby simplifying several functions
- Plugged 2 leaks in the fallback detector
- Renamed the segment manager and resource manager to "segmentManager" and "resourceManager" in all places, for consistency
svn-id: r43722
Diffstat (limited to 'engines/sci/sfx/core.h')
| -rw-r--r-- | engines/sci/sfx/core.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/sfx/core.h b/engines/sci/sfx/core.h index e7eba85c99..fc480aa452 100644 --- a/engines/sci/sfx/core.h +++ b/engines/sci/sfx/core.h @@ -52,7 +52,7 @@ public: // FIXME, make private bool _suspended; /**< Whether we are suspended */ Resource *_syncResource; /**< Used by kDoSync for speech syncing in CD talkie games */ uint _syncOffset; - ResourceManager *_resMgr; + ResourceManager *_resourceManager; public: SfxState(); @@ -63,10 +63,10 @@ public: /***********/ /* Initializes the sound engine - ** Parameters: (ResourceManager *) resmgr: Resource manager for initialization + ** Parameters: (ResourceManager *) resourceManager: Resource manager for initialization ** (int) flags: SFX_STATE_FLAG_* */ - void sfx_init(ResourceManager *resmgr, int flags); + void sfx_init(ResourceManager *resourceManager, int flags); /** Deinitializes the sound subsystem. */ void sfx_exit(); |