diff options
| author | Torbjörn Andersson | 2003-12-28 15:08:12 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2003-12-28 15:08:12 +0000 |
| commit | 6ae8218d537a2b627a0abad597d5084c796d1de8 (patch) | |
| tree | 13941f5a83d4594739f665b364cb4d05154be6fc /sword2/sound.cpp | |
| parent | 302c9f72fcf76cde76a3ee467b0fe5771a5faa3f (diff) | |
| download | scummvm-rg350-6ae8218d537a2b627a0abad597d5084c796d1de8.tar.gz scummvm-rg350-6ae8218d537a2b627a0abad597d5084c796d1de8.tar.bz2 scummvm-rg350-6ae8218d537a2b627a0abad597d5084c796d1de8.zip | |
Hopefully the last big renaming. Now the datatypes have names like
"StandardHeader" instead of "_standardHeader".
svn-id: r11997
Diffstat (limited to 'sword2/sound.cpp')
| -rw-r--r-- | sword2/sound.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sword2/sound.cpp b/sword2/sound.cpp index 195b2b2176..d621b236ed 100644 --- a/sword2/sound.cpp +++ b/sword2/sound.cpp @@ -86,7 +86,7 @@ void Sword2Engine::triggerFx(uint8 j) { if (_fxQueue[j].type == FX_SPOT) { // load in the sample data = _resman->openResource(_fxQueue[j].resource); - data += sizeof(_standardHeader); + data += sizeof(StandardHeader); // wav data gets copied to sound memory rv = _sound->playFx(id, data, _fxQueue[j].volume, _fxQueue[j].pan, RDSE_FXSPOT); // release the sample @@ -160,7 +160,7 @@ int32 Logic::fnPlayFx(int32 *params) { uint32 rv; #ifdef _SWORD2_DEBUG - _standardHeader *header; + StandardHeader *header; #endif if (_vm->_wantSfxDebug) { @@ -210,7 +210,7 @@ int32 Logic::fnPlayFx(int32 *params) { data = _vm->_resman->openResource(_vm->_fxQueue[j].resource); #ifdef _SWORD2_DEBUG - header = (_standardHeader *) data; + header = (StandardHeader *) data; if (header->fileType != WAV_FILE) error("fnPlayFx given invalid resource"); #endif @@ -226,12 +226,12 @@ int32 Logic::fnPlayFx(int32 *params) { data = _vm->_resman->openResource(_vm->_fxQueue[j].resource); #ifdef _SWORD2_DEBUG - header = (_standardHeader *) data; + header = (StandardHeader *) data; if (header->fileType != WAV_FILE) error("fnPlayFx given invalid resource"); #endif - data += sizeof(_standardHeader); + data += sizeof(StandardHeader); // copy it to sound memory, using position in queue as 'id' rv = _vm->_sound->openFx(id, data); |