diff options
| author | Paul Gilbert | 2010-08-05 11:52:13 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-10-12 22:24:37 +0000 |
| commit | ccba0891fdce8e043fbb7cc5e4015590ab8a7b6b (patch) | |
| tree | 7973836cdf496e380790a33cc4e049df6c71e7ef /engines/sword25/sfx/soundengine.h | |
| parent | 7bc8cd284a0929f67b51dd9ffbd6dd6ce09f0746 (diff) | |
| download | scummvm-rg350-ccba0891fdce8e043fbb7cc5e4015590ab8a7b6b.tar.gz scummvm-rg350-ccba0891fdce8e043fbb7cc5e4015590ab8a7b6b.tar.bz2 scummvm-rg350-ccba0891fdce8e043fbb7cc5e4015590ab8a7b6b.zip | |
SWORD25: Converted further files from old hashmap.h to Common::HashMap
This commit includes a class pointer hash function added in objectregistry.h that should be double-checked to see if it's correct.
svn-id: r53211
Diffstat (limited to 'engines/sword25/sfx/soundengine.h')
| -rw-r--r-- | engines/sword25/sfx/soundengine.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sword25/sfx/soundengine.h b/engines/sword25/sfx/soundengine.h index c0038eb49c..35bab0c3d6 100644 --- a/engines/sword25/sfx/soundengine.h +++ b/engines/sword25/sfx/soundengine.h @@ -166,7 +166,7 @@ public: * @remark If more control is needed over the playing, eg. changing the sound parameters * for Volume and Panning, then PlaySoundEx should be used. */ - virtual bool PlaySound(const std::string& FileName, SOUND_TYPES Type, float Volume = 1.0f, float Pan = 0.0f, bool Loop = false, int LoopStart = -1, int LoopEnd = -1, unsigned int Layer = 0) = 0; + virtual bool PlaySound(const Common::String &FileName, SOUND_TYPES Type, float Volume = 1.0f, float Pan = 0.0f, bool Loop = false, int LoopStart = -1, int LoopEnd = -1, unsigned int Layer = 0) = 0; /** * Plays a sound @@ -183,7 +183,7 @@ public: * @remark If more control is needed over the playing, eg. changing the sound parameters * for Volume and Panning, then PlaySoundEx should be used. */ - virtual unsigned int PlaySoundEx(const std::string& FileName, SOUND_TYPES Type, float Volume = 1.0f, float Pan = 0.0f, bool Loop = false, int LoopStart = -1, int LoopEnd = -1, unsigned int Layer = 0) = 0; + virtual unsigned int PlaySoundEx(const Common::String &FileName, SOUND_TYPES Type, float Volume = 1.0f, float Pan = 0.0f, bool Loop = false, int LoopStart = -1, int LoopEnd = -1, unsigned int Layer = 0) = 0; /** * Plays a sound generated at runtime |