diff options
| author | Paul Gilbert | 2019-05-11 16:15:07 +1000 |
|---|---|---|
| committer | Paul Gilbert | 2019-05-11 16:15:07 +1000 |
| commit | 96ebd81e5f29e9cde3d83c4af0b9166cd1f40b26 (patch) | |
| tree | e98af72cbb3ca116434f5edd2d2ccd0c745e1161 /engines/glk/alan2/execute.cpp | |
| parent | 34122d2f47b4a80a26ea4361a35cba50b5ab5cc0 (diff) | |
| download | scummvm-rg350-96ebd81e5f29e9cde3d83c4af0b9166cd1f40b26.tar.gz scummvm-rg350-96ebd81e5f29e9cde3d83c4af0b9166cd1f40b26.tar.bz2 scummvm-rg350-96ebd81e5f29e9cde3d83c4af0b9166cd1f40b26.zip | |
GLK: HUGO: NULL to nullptr, Amiga compilation fix
Diffstat (limited to 'engines/glk/alan2/execute.cpp')
| -rw-r--r-- | engines/glk/alan2/execute.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/glk/alan2/execute.cpp b/engines/glk/alan2/execute.cpp index 8359c47e37..4fc0acb33b 100644 --- a/engines/glk/alan2/execute.cpp +++ b/engines/glk/alan2/execute.cpp @@ -234,7 +234,7 @@ bool Execute::confirm(MsgKind msgno) { #ifdef USE_READLINE if (!readline(buf)) return true; #else - if (gets(buf) == NULL) return true; + if (gets(buf) == nullptr) return true; #endif #endif @@ -260,7 +260,7 @@ void Execute::quit() { #ifdef USE_READLINE if (!readline(buf)) terminate(0); #else - if (gets(buf) == NULL) terminate(0); + if (gets(buf) == nullptr) terminate(0); #endif #endif @@ -682,17 +682,17 @@ void Execute::dscrobj(Aword obj) { void Execute::dscract(Aword act) { - ScrElem *scr = NULL; + ScrElem *scr = nullptr; if (_acts[act - ACTMIN].script != 0) { for (scr = (ScrElem *) addrTo(_acts[act - ACTMIN].scradr); !endOfTable(scr); scr++) if (scr->code == _acts[act - ACTMIN].script) break; if (endOfTable(scr)) - scr = NULL; + scr = nullptr; } - if (scr != NULL && scr->dscr != 0) + if (scr != nullptr && scr->dscr != 0) _vm->_interpreter->interpret(scr->dscr); else if (_acts[act - ACTMIN].dscr != 0) _vm->_interpreter->interpret(_acts[act - ACTMIN].dscr); |