diff options
| -rw-r--r-- | engines/startrek/awaymission.cpp | 2 | ||||
| -rw-r--r-- | engines/startrek/intro.cpp | 4 | ||||
| -rw-r--r-- | engines/startrek/space.cpp | 4 | ||||
| -rw-r--r-- | engines/startrek/textbox.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/engines/startrek/awaymission.cpp b/engines/startrek/awaymission.cpp index ce70903fd7..9b4d936f05 100644 --- a/engines/startrek/awaymission.cpp +++ b/engines/startrek/awaymission.cpp @@ -565,7 +565,7 @@ void StarTrekEngine::handleAwayMissionAction() { break; case OBJECT_REDSHIRT: - showTextbox(nullptr, getLoadedText(GROUNDTX_REDSHIRT_USE), 20, 20, TEXTCOLOR_YELLOW, 0); + showTextbox(NULL, getLoadedText(GROUNDTX_REDSHIRT_USE), 20, 20, TEXTCOLOR_YELLOW, 0); break; case OBJECT_IPHASERS: diff --git a/engines/startrek/intro.cpp b/engines/startrek/intro.cpp index 8d17fc48b0..08cd08a71c 100644 --- a/engines/startrek/intro.cpp +++ b/engines/startrek/intro.cpp @@ -39,8 +39,8 @@ void StarTrekEngine::playIntro() { R3 planetR3 = R3(); planetR3.matrix = initMatrix(); planetR3.field1e = 3; - planetR3.funcPtr1 = nullptr; - planetR3.funcPtr2 = nullptr; + planetR3.funcPtr1 = NULL; + planetR3.funcPtr2 = NULL; planetR3.bitmapOffset = 0; _gfx->clearScreenAndPriBuffer(); diff --git a/engines/startrek/space.cpp b/engines/startrek/space.cpp index 054e78b37f..0286408ca7 100644 --- a/engines/startrek/space.cpp +++ b/engines/startrek/space.cpp @@ -228,7 +228,7 @@ void StarTrekEngine::drawR3Shape(R3 *r3) { if (r3->field1e != 3) // TODO: remove this return; - if (r3->funcPtr1 != nullptr) { + if (r3->funcPtr1 != NULL) { // TODO: call it } @@ -485,7 +485,7 @@ void StarTrekEngine::drawR3Shape(R3 *r3) { } } - if (r3->funcPtr2 != nullptr) { + if (r3->funcPtr2 != NULL) { // TODO: call it } } 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) { |