diff options
| author | Filippos Karapetis | 2009-05-27 12:46:11 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-05-27 12:46:11 +0000 |
| commit | e0a059394975b0dc9c52f3152488ee3bad0594c0 (patch) | |
| tree | ab761fe41ff78d310775c191d5f61ccc22c06473 | |
| parent | c0d13da750b2579cf94663ff2224a3d2971e91be (diff) | |
| download | scummvm-rg350-e0a059394975b0dc9c52f3152488ee3bad0594c0.tar.gz scummvm-rg350-e0a059394975b0dc9c52f3152488ee3bad0594c0.tar.bz2 scummvm-rg350-e0a059394975b0dc9c52f3152488ee3bad0594c0.zip | |
Fixed a typo, and added parentheses to clarify order
svn-id: r40938
| -rw-r--r-- | engines/sci/engine/game.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/kmisc.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp index 878109a2e7..eef539d463 100644 --- a/engines/sci/engine/game.cpp +++ b/engines/sci/engine/game.cpp @@ -438,7 +438,7 @@ int script_init_engine(EngineState *s, sci_version_t version) { s->bp_list = NULL; // No breakpoints defined s->have_bp = 0; - if (s->flags & GF_SCI1_LOFSABSOLUTE && s->version < SCI_VERSION_1_1) + if ((s->flags & GF_SCI1_LOFSABSOLUTE) && s->version < SCI_VERSION_1_1) s->seg_manager->setExportWidth(1); else s->seg_manager->setExportWidth(0); diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp index 5f7efd0823..e1772926d7 100644 --- a/engines/sci/engine/kmisc.cpp +++ b/engines/sci/engine/kmisc.cpp @@ -201,7 +201,7 @@ reg_t kMemory(EngineState *s, int funct_nr, int argc, reg_t *argv) { if (!ref) { // This occurs in KQ5CD when interacting with certain objects - warning("Attempt to poke invalid memory at %04x:%04x", PRINT_REG(argv[1])); + warning("Attempt to peek invalid memory at %04x:%04x", PRINT_REG(argv[1])); return s->r_acc; } if (s->seg_manager->_heap[argv[1].segment]->getType() == MEM_OBJ_LOCALS) @@ -214,7 +214,6 @@ reg_t kMemory(EngineState *s, int funct_nr, int argc, reg_t *argv) { byte *ref = kernel_dereference_bulk_pointer(s, argv[1], 2); if (!ref) { - // This occurs in KQ5CD when interacting with certain objects warning("Attempt to poke invalid memory at %04x:%04x", PRINT_REG(argv[1])); return s->r_acc; } |