diff options
| -rw-r--r-- | engines/sci/engine/file.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/kgraphics32.cpp | 3 | ||||
| -rw-r--r-- | engines/sci/engine/script.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/engines/sci/engine/file.cpp b/engines/sci/engine/file.cpp index 3470d23fe2..c44963f457 100644 --- a/engines/sci/engine/file.cpp +++ b/engines/sci/engine/file.cpp @@ -427,7 +427,7 @@ bool VirtualIndexFile::seek(int32 offset, int whence) { _ptr = _buffer + offset; break; case SEEK_END: - assert(_bufferSize - offset >= 0); + assert((int32)_bufferSize - offset >= 0); _ptr = _buffer + (_bufferSize - offset); break; } diff --git a/engines/sci/engine/kgraphics32.cpp b/engines/sci/engine/kgraphics32.cpp index 53cf8ada75..377c05935a 100644 --- a/engines/sci/engine/kgraphics32.cpp +++ b/engines/sci/engine/kgraphics32.cpp @@ -241,6 +241,7 @@ reg_t kSetShowStyle(EngineState *s, int argc, reg_t *argv) { //int16 priority = argv[4].toSint16(); // always 0xc8 (200) when fading in/out //uint16 animate = argv[5].toUint16(); // boolean, animate or not while the transition lasts //uint16 refFrame = argv[6].toUint16(); // refFrame, always 0 when fading in/out +#if 0 int16 divisions; // If the game has the pFadeArray selector, another parameter is used here, @@ -252,7 +253,7 @@ reg_t kSetShowStyle(EngineState *s, int argc, reg_t *argv) { } else { divisions = (argc >= 8) ? argv[7].toSint16() : -1; // divisions (transition steps?) } - +#endif if (showStyle > 15) { warning("kSetShowStyle: Illegal style %d for plane %04x:%04x", showStyle, PRINT_REG(planeObj)); return s->r_acc; diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp index 0ed9598b41..ca7eaad383 100644 --- a/engines/sci/engine/script.cpp +++ b/engines/sci/engine/script.cpp @@ -199,7 +199,7 @@ void Script::load(int script_nr, ResourceManager *resMan) { _localsOffset = 0; if (_localsOffset + _localsCount * 2 + 1 >= (int)_bufSize) { - error("Locals extend beyond end of script: offset %04x, count %d vs size %d", _localsOffset, _localsCount, _bufSize); + error("Locals extend beyond end of script: offset %04x, count %d vs size %d", _localsOffset, _localsCount, (int)_bufSize); //_localsCount = (_bufSize - _localsOffset) >> 1; } } |