diff options
| author | Eugene Sandulenko | 2018-08-09 09:20:51 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-08-09 09:20:51 +0200 |
| commit | 85cd34750395475701cad009d221646744eb2f16 (patch) | |
| tree | a32f05d5d4b865d258ccc0b1d527b0f2c6c225ee /engines/startrek/textbox.cpp | |
| parent | ad90059e879e8608ebfb4253a114a785644e6f20 (diff) | |
| download | scummvm-rg350-85cd34750395475701cad009d221646744eb2f16.tar.gz scummvm-rg350-85cd34750395475701cad009d221646744eb2f16.tar.bz2 scummvm-rg350-85cd34750395475701cad009d221646744eb2f16.zip | |
STARTREK: Fix compilation on macOS
nullptr is an object on macOS.
Diffstat (limited to 'engines/startrek/textbox.cpp')
| -rw-r--r-- | engines/startrek/textbox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/startrek/textbox.cpp b/engines/startrek/textbox.cpp index f82369c867..0e38ec7cfd 100644 --- a/engines/startrek/textbox.cpp +++ b/engines/startrek/textbox.cpp @@ -636,7 +636,7 @@ String StarTrekEngine::readLineFormattedText(TextGetterFunc textGetter, uintptr return lineFormattedText; } else - return nullptr; + return NULL; } String StarTrekEngine::readTextFromArray(int choiceIndex, uintptr data, String *headerTextOutput) { |