libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 14:50:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

KYRA: fix gcc warnings

Browse Source
This commit is contained in:
athrxx 2020-12-19 03:03:12 +01:00
parent 34e8ecb492
commit d3dc9d2276
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/kyra/sound/drivers/adlib.cpp
View File

@ -1374,7 +1374,7 @@ int AdLibDriver::update_jump(const uint8 *&dataptr, Channel &channel, uint8 valu
int16 add = READ_LE_UINT16(dataptr); dataptr += 2;
if (_version == 1) {
// Safety check: ignore jump to invalid address
if (add < 191 || add - 191 >= _soundDataSize)
if (add < 191 || add - 191 >= (int32)_soundDataSize)
dataptr = nullptr;
else
dataptr = _soundData + add - 191;
@ -1404,7 +1404,7 @@ int AdLibDriver::update_jumpToSubroutine(const uint8 *&dataptr, Channel &channel
}
channel.dataptrStack[channel.dataptrStackPos++] = dataptr;
if (_version < 3) {
if (add < 191 || add - 191 >= _soundDataSize)
if (add < 191 || add - 191 >= (int32)_soundDataSize)
dataptr = nullptr;
else
dataptr = _soundData + add - 191;
@ -1490,7 +1490,7 @@ int AdLibDriver::update_setupSecondaryEffect1(const uint8 *&dataptr, Channel &ch
// Safety check: don't enable effect when table location is invalid.
int start = channel.secondaryEffectData + channel.secondaryEffectSize;
if (start < 0 || start >= _soundDataSize) {
if (start < 0 || start >= (int)_soundDataSize) {
warning("AdLibDriver::update_setupSecondaryEffect1: Ignoring due to invalid table location");
channel.secondaryEffect = nullptr;
}

2
engines/kyra/sound/drivers/pc_base.h
View File

@ -55,7 +55,7 @@ public:
protected:
uint8 *getProgram(int progId) {
// Safety check: invalid progId would crash.
if (progId < 0 || progId >= _soundDataSize / 2)
if (progId < 0 || progId >= (int32)_soundDataSize / 2)
return nullptr;
const uint16 offset = READ_LE_UINT16(_soundData + 2 * progId);