diff options
| author | Johannes Schickel | 2009-12-25 03:29:17 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-12-25 03:29:17 +0000 |
| commit | f642687638f809a7669d4154b8d70a3e7e013154 (patch) | |
| tree | 59f1df399b358a8cc311ca76aadea17e671a46e8 | |
| parent | f2dd376b385bd6b1b513fe97004aa2dfc3422d15 (diff) | |
| download | scummvm-rg350-f642687638f809a7669d4154b8d70a3e7e013154.tar.gz scummvm-rg350-f642687638f809a7669d4154b8d70a3e7e013154.tar.bz2 scummvm-rg350-f642687638f809a7669d4154b8d70a3e7e013154.zip | |
Fix gcc warning (and along with it make the code a little bit easier to read).
svn-id: r46542
| -rw-r--r-- | engines/sci/engine/kfile.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp index 257abaeaa7..99c953ff43 100644 --- a/engines/sci/engine/kfile.cpp +++ b/engines/sci/engine/kfile.cpp @@ -863,7 +863,7 @@ reg_t kFileIO(EngineState *s, int argc, reg_t *argv) { #ifdef ENABLE_SCI32 case K_FILEIO_READ_BYTE: // Read the byte into the low byte of the accumulator - return make_reg(0, s->r_acc.toUint16() & 0xff00 | getFileFromHandle(s, argv[1].toUint16())->_in->readByte()); + return make_reg(0, (s->r_acc.toUint16() & 0xff00) | getFileFromHandle(s, argv[1].toUint16())->_in->readByte()); case K_FILEIO_WRITE_BYTE: getFileFromHandle(s, argv[1].toUint16())->_out->writeByte(argv[2].toUint16() & 0xff); break; @@ -873,7 +873,7 @@ reg_t kFileIO(EngineState *s, int argc, reg_t *argv) { getFileFromHandle(s, argv[1].toUint16())->_out->writeUint16LE(argv[2].toUint16()); break; #endif - default : + default: error("Unknown FileIO() sub-command: %d", func_nr); } |