diff options
| -rw-r--r-- | scumm/costume.cpp | 2 | ||||
| -rw-r--r-- | scumm/script_v5.cpp | 2 | ||||
| -rw-r--r-- | scumm/script_v6.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scumm/costume.cpp b/scumm/costume.cpp index d561d503a4..0151b5ac55 100644 --- a/scumm/costume.cpp +++ b/scumm/costume.cpp @@ -719,7 +719,7 @@ void Scumm::cost_decodeData(Actor *a, int frame, uint usemask) { i++; usemask <<= 1; mask <<= 1; - } while ((uint16)mask); + } while (mask&0xFFFF); } void CostumeRenderer::setPalette(byte *palette) { diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index b2c3cf1f99..110fd39261 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -2680,7 +2680,7 @@ printf("o5_oldRoomEffect ODDBALL: _opcode = 0x%x, a = 0x%x\n", _opcode, a); } if (a) { - _switchRoomEffect = (byte)a; + _switchRoomEffect = (byte)(a&0xFF); _switchRoomEffect2 = (byte)(a >> 8); } else { fadeIn(_newEffect); diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 462c4429f7..31f5eea0fb 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -1540,7 +1540,7 @@ void Scumm_v6::o6_roomOps() { case 181: a = pop(); if (a) { - _switchRoomEffect = (byte)(a); + _switchRoomEffect = (byte)(a&0xFF); _switchRoomEffect2 = (byte)(a >> 8); } else { fadeIn(_newEffect); |