libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 21:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

KYRA: (HOF) - minor cleanup

Browse Source
This commit is contained in:
athrxx 2020-01-03 01:23:03 +01:00
parent 16b2b3ac8f
commit 48b834bd5e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/kyra/engine/kyra_hof.cpp
View File

@ -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()) {

2
engines/kyra/engine/kyra_hof.h
View File

@ -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;

4
engines/kyra/resource/staticres.cpp
View File

@ -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);