diff options
| author | Paul Gilbert | 2019-06-13 19:43:34 -0700 |
|---|---|---|
| committer | Paul Gilbert | 2019-06-13 20:45:53 -0700 |
| commit | 4f7c9899f214d327fa0181b47435370275ffd8ae (patch) | |
| tree | 843e1f88aa980cfda982dab688a3b5e18a3fe4f5 /engines/glk | |
| parent | 8759a9e851283c69e8c86ce15eed7e2e53bc032c (diff) | |
| download | scummvm-rg350-4f7c9899f214d327fa0181b47435370275ffd8ae.tar.gz scummvm-rg350-4f7c9899f214d327fa0181b47435370275ffd8ae.tar.bz2 scummvm-rg350-4f7c9899f214d327fa0181b47435370275ffd8ae.zip | |
GLK: ADVSYS: Initialization fixes
Diffstat (limited to 'engines/glk')
| -rw-r--r-- | engines/glk/advsys/glk_interface.cpp | 2 | ||||
| -rw-r--r-- | engines/glk/advsys/vm.cpp | 3 | ||||
| -rw-r--r-- | engines/glk/advsys/vm.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/engines/glk/advsys/glk_interface.cpp b/engines/glk/advsys/glk_interface.cpp index 3e1ccb6a3b..be164f21cd 100644 --- a/engines/glk/advsys/glk_interface.cpp +++ b/engines/glk/advsys/glk_interface.cpp @@ -27,7 +27,7 @@ namespace AdvSys { bool GlkInterface::initialize() { _window = glk_window_open(0, 0, 0, wintype_TextBuffer, 1); - return !_window; + return _window != nullptr; } void GlkInterface::print(const Common::String &msg) { diff --git a/engines/glk/advsys/vm.cpp b/engines/glk/advsys/vm.cpp index 17db9ab743..e21c5ac2d6 100644 --- a/engines/glk/advsys/vm.cpp +++ b/engines/glk/advsys/vm.cpp @@ -104,8 +104,7 @@ ExecutionResult VM::execute(int offset) { void VM::executeOpcode() { // Get next opcode - uint opcode = getCodeByte(_pc); - ++_pc; + uint opcode = readCodeByte(); if (opcode >= OP_BRT && opcode <= OP_VOWEL) { (this->*_METHODS[(int)opcode - 1])(); diff --git a/engines/glk/advsys/vm.h b/engines/glk/advsys/vm.h index 6a877c9ef0..76f05de691 100644 --- a/engines/glk/advsys/vm.h +++ b/engines/glk/advsys/vm.h @@ -165,7 +165,7 @@ public: /** * Constructor */ - FunctionPointer(FixedStack &s) : _stack(s), _index(-1) {} + FunctionPointer(FixedStack &s) : _stack(s), _index(0) {} /** * Array indexing |