libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-13 23:43:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

KYRA: (EOB) - fix warnings

Browse Source
This commit is contained in:
athrxx 2023-05-12 15:54:00 +02:00
parent 77976efabe
commit cf7a1e4494
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/kyra/sequence/sequences_eob.cpp
View File

@ -2473,7 +2473,7 @@ void EoBEngine::seq_segaOpeningCredits(bool jumpToTitle) {
r->loadToVRAM(scrollTable, 0x400, 0xD800);
Common::SeekableReadStreamEndian *containerAlt = _sres->loadContainer("CREDIT") ? 0 : _res->createEndianAwareReadStream("CREDIT");
Common::SeekableReadStreamEndian *in = containerAlt ? new Common::SeekableSubReadStreamEndian(containerAlt, 0, 35840, true) : _sres->resStreamEndian(1);
Common::SeekableReadStreamEndian *in = containerAlt ? new Common::SeekableReadStreamEndianWrapper(new Common::SeekableSubReadStream(containerAlt, 0, 35840), true, DisposeAfterUse::YES) : _sres->resStreamEndian(1);
r->loadStreamToVRAM(in, 32, !containerAlt);
delete in;
@ -2491,8 +2491,7 @@ void EoBEngine::seq_segaOpeningCredits(bool jumpToTitle) {
updateScrollState(scrollTable, 320);
r->loadToVRAM(scrollTable, 0x400, 0xD800);
_screen->sega_selectPalette(i == 3 && _flags.lang == Common::EN_ANY ? 59 : 50, 0, true);
in = containerAlt ? new Common::SeekableSubReadStreamEndian(containerAlt, i * 35840, (i + 1) * 35840, true) : _sres->resStreamEndian(i);
in = containerAlt ? new Common::SeekableReadStreamEndianWrapper(new Common::SeekableSubReadStream(containerAlt, i * 35840, (i + 1) * 35840), true, DisposeAfterUse::YES) : _sres->resStreamEndian(i);
r->loadStreamToVRAM(in, 32, !containerAlt);
delete in;
@ -2539,8 +2538,7 @@ void EoBEngine::seq_segaOpeningCredits(bool jumpToTitle) {
r->memsetVRAM(0xD800, 0, 0x400);
r->setPitch(64);
_screen->sega_selectPalette(0, 0);
in = containerAlt ? new Common::SeekableSubReadStreamEndian(containerAlt, last * 35840, (last + 1) * 35840, true) : _sres->resStreamEndian(last);
in = containerAlt ? new Common::SeekableReadStreamEndianWrapper(new Common::SeekableSubReadStream(containerAlt, last * 35840, (last + 1) * 35840), true, DisposeAfterUse::YES) : _sres->resStreamEndian(last);
r->loadStreamToVRAM(in, 32, !containerAlt);
delete in;
delete containerAlt;

6
engines/kyra/sound/sound_pc98_darkmoon.cpp
View File

@ -123,9 +123,9 @@ void SoundPC98_Darkmoon::updateVolumeSettings() {
if (!_driver || !_ready)
return;
bool mute = false;
if (ConfMan.hasKey("mute"))
mute = ConfMan.getBool("mute");
//bool mute = false;
//if (ConfMan.hasKey("mute"))
// mute = ConfMan.getBool("mute");
//_driver->setMusicVolume((mute ? 0 : ConfMan.getInt("music_volume")));
//_driver->setSoundEffectVolume((mute ? 0 : ConfMan.getInt("sfx_volume")));