diff options
| author | athrxx | 2020-01-03 01:23:03 +0100 |
|---|---|---|
| committer | athrxx | 2020-01-03 13:04:11 +0100 |
| commit | 48b834bd5e4ff5d5f992a19373b4986f44aa9ccd (patch) | |
| tree | 18d29c679eaa6c3e41ca70ef3580cd3bd6d60f2d | |
| parent | 16b2b3ac8f67a67de8c1bf0f62e3a47848c57efc (diff) | |
| download | scummvm-rg350-48b834bd5e4ff5d5f992a19373b4986f44aa9ccd.tar.gz scummvm-rg350-48b834bd5e4ff5d5f992a19373b4986f44aa9ccd.tar.bz2 scummvm-rg350-48b834bd5e4ff5d5f992a19373b4986f44aa9ccd.zip | |
KYRA: (HOF) - minor cleanup
| -rw-r--r-- | engines/kyra/engine/kyra_hof.cpp | 4 | ||||
| -rw-r--r-- | engines/kyra/engine/kyra_hof.h | 2 | ||||
| -rw-r--r-- | engines/kyra/resource/staticres.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/kyra/engine/kyra_hof.cpp b/engines/kyra/engine/kyra_hof.cpp index bc09be038c..2e5d091bf9 100644 --- a/engines/kyra/engine/kyra_hof.cpp +++ b/engines/kyra/engine/kyra_hof.cpp @@ -1460,8 +1460,8 @@ void KyraEngine_HoF::snd_playSoundEffect(int track, int volume) { if (track == -1) return; - int16 prio = (int16)READ_LE_UINT16(&_ingameSoundIndex[track * 2 + 1]); - int16 file = (int16)READ_LE_UINT16(&_ingameSoundIndex[track * 2]); + int16 prio = READ_LE_INT16(&_ingameSoundIndex[track * 2 + 1]); + int16 file = READ_LE_INT16(&_ingameSoundIndex[track * 2]); prio = prio <= 0 ? -prio : (prio * volume) >> 8; if (file != -1 && _sound->useDigitalSfx()) { diff --git a/engines/kyra/engine/kyra_hof.h b/engines/kyra/engine/kyra_hof.h index 27638132bb..04ee2b6ac7 100644 --- a/engines/kyra/engine/kyra_hof.h +++ b/engines/kyra/engine/kyra_hof.h @@ -642,7 +642,7 @@ protected: int _cdaTrackTableFinaleSize; const char *const *_ingameSoundList; int _ingameSoundListSize; - const uint16 *_ingameSoundIndex; + const int16 *_ingameSoundIndex; int _ingameSoundIndexSize; const uint16 *_ingameTalkObjIndex; int _ingameTalkObjIndexSize; diff --git a/engines/kyra/resource/staticres.cpp b/engines/kyra/resource/staticres.cpp index 8f7e41b886..61adcd998a 100644 --- a/engines/kyra/resource/staticres.cpp +++ b/engines/kyra/resource/staticres.cpp @@ -977,14 +977,14 @@ void KyraEngine_LoK::loadMainScreen(int page) { void KyraEngine_HoF::initStaticResource() { _ingamePakList = _staticres->loadStrings(k2IngamePakFiles, _ingamePakListSize); _ingameSoundList = _staticres->loadStrings(k2IngameSfxFiles, _ingameSoundListSize); - _ingameSoundIndex = (const uint16 *)_staticres->loadRawData(k2IngameSfxIndex, _ingameSoundIndexSize); + _ingameSoundIndex = (const int16*)_staticres->loadRawData(k2IngameSfxIndex, _ingameSoundIndexSize); _musicFileListIntro = _staticres->loadStrings(k2SeqplayIntroTracks, _musicFileListIntroSize); _musicFileListIngame = _staticres->loadStrings(k2IngameTracks, _musicFileListIngameSize); _musicFileListFinale = _staticres->loadStrings(k2SeqplayFinaleTracks, _musicFileListFinaleSize); _cdaTrackTableIntro = _staticres->loadRawData(k2SeqplayIntroCDA, _cdaTrackTableIntroSize); _cdaTrackTableIngame = _staticres->loadRawData(k2IngameCDA, _cdaTrackTableIngameSize); _cdaTrackTableFinale = _staticres->loadRawData(k2SeqplayFinaleCDA, _cdaTrackTableFinaleSize); - _ingameTalkObjIndex = (const uint16 *)_staticres->loadRawData(k2IngameTalkObjIndex, _ingameTalkObjIndexSize); + _ingameTalkObjIndex = (const uint16*)_staticres->loadRawData(k2IngameTalkObjIndex, _ingameTalkObjIndexSize); _ingameTimJpStr = _staticres->loadStrings(k2IngameTimJpStrings, _ingameTimJpStrSize); _itemAnimDefinition = _staticres->loadItemAnimDefinition(k2IngameShapeAnimData, _itemAnimDefinitionSize); |