diff options
| author | Borja Lorente | 2016-08-11 10:00:50 +0200 |
|---|---|---|
| committer | Borja Lorente | 2016-08-19 16:29:16 +0200 |
| commit | 1bb3d1412918be5faa0f1994beb6afaddf3b768a (patch) | |
| tree | 5632e26988d399cfb009bd20d45df75c9b5eb527 /engines/macventure/gui.cpp | |
| parent | 896e08cde8cd13d0ba3c4c7df253d4619e3b5933 (diff) | |
| download | scummvm-rg350-1bb3d1412918be5faa0f1994beb6afaddf3b768a.tar.gz scummvm-rg350-1bb3d1412918be5faa0f1994beb6afaddf3b768a.tar.bz2 scummvm-rg350-1bb3d1412918be5faa0f1994beb6afaddf3b768a.zip | |
MACVENTURE: Unify NULLs
Diffstat (limited to 'engines/macventure/gui.cpp')
| -rw-r--r-- | engines/macventure/gui.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/macventure/gui.cpp b/engines/macventure/gui.cpp index 56381369bb..65b11ee402 100644 --- a/engines/macventure/gui.cpp +++ b/engines/macventure/gui.cpp @@ -103,11 +103,11 @@ void menuCommandsCallback(int action, Common::String &text, void *data); Gui::Gui(MacVentureEngine *engine, Common::MacResManager *resman) { _engine = engine; _resourceManager = resman; - _windowData = nullptr; - _controlData = nullptr; + _windowData = NULL; + _controlData = NULL; _draggedObj.id = 0; _draggedObj.pos = Common::Point(0, 0); - _dialog = nullptr; + _dialog = NULL; _cursor = new Cursor(this); @@ -846,7 +846,7 @@ void Gui::showPrebuiltDialog(PrebuiltDialogs type) { } bool Gui::isDialogOpen() { - return _dialog != nullptr; + return _dialog != NULL; } void Gui::setTextInput(Common::String str) { @@ -856,7 +856,7 @@ void Gui::setTextInput(Common::String str) { void Gui::closeDialog() { delete _dialog; - _dialog = nullptr; + _dialog = NULL; } void Gui::getTextFromUser() { @@ -950,7 +950,7 @@ Graphics::MacWindow * Gui::findWindow(WindowReference reference) { } switch (reference) { case MacVenture::kNoWindow: - return nullptr; + return NULL; case MacVenture::kCommandsWindow: return _controlsWindow; case MacVenture::kMainGameWindow: @@ -964,7 +964,7 @@ Graphics::MacWindow * Gui::findWindow(WindowReference reference) { case MacVenture::kDiplomaWindow: return _diplomaWindow; } - return nullptr; + return NULL; } void Gui::ensureInventoryOpen(WindowReference reference, ObjID id) { |