diff options
| -rw-r--r-- | engines/supernova/detection.cpp | 12 | ||||
| -rw-r--r-- | engines/supernova/graphics.cpp | 4 | ||||
| -rw-r--r-- | engines/supernova/resman.cpp | 2 | ||||
| -rw-r--r-- | engines/supernova/supernova.cpp | 8 | ||||
| -rw-r--r-- | engines/supernova/supernova.h | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/engines/supernova/detection.cpp b/engines/supernova/detection.cpp index a26274c3bf..b172b7fa49 100644 --- a/engines/supernova/detection.cpp +++ b/engines/supernova/detection.cpp @@ -32,7 +32,7 @@ static const PlainGameDescriptor supernovaGames[] = { {"msn1", "Mission Supernova 1"}, {"msn2", "Mission Supernova 2"}, - {NULL, NULL} + {nullptr, nullptr} }; namespace Supernova { @@ -40,7 +40,7 @@ static const ADGameDescription gameDescriptions[] = { // Mission Supernova 1 { "msn1", - NULL, + nullptr, AD_ENTRY1s("msn_data.000", "f64f16782a86211efa919fbae41e7568", 24163), Common::DE_DEU, Common::kPlatformDOS, @@ -49,7 +49,7 @@ static const ADGameDescription gameDescriptions[] = { }, { "msn1", - NULL, + nullptr, AD_ENTRY1s("msn_data.000", "f64f16782a86211efa919fbae41e7568", 24163), Common::EN_ANY, Common::kPlatformDOS, @@ -60,7 +60,7 @@ static const ADGameDescription gameDescriptions[] = { // Mission Supernova 2 { "msn2", - NULL, + nullptr, AD_ENTRY1s("ms2_data.000", "e595610cba4a6d24a763e428d05cc83f", 24805), Common::DE_DEU, Common::kPlatformDOS, @@ -69,7 +69,7 @@ static const ADGameDescription gameDescriptions[] = { }, { "msn2", - NULL, + nullptr, AD_ENTRY1s("ms2_data.000", "e595610cba4a6d24a763e428d05cc83f", 24805), Common::EN_ANY, Common::kPlatformDOS, @@ -131,7 +131,7 @@ bool SupernovaMetaEngine::createInstance(OSystem *syst, Engine **engine, const A *engine = new Supernova::SupernovaEngine(syst); } - return desc != NULL; + return desc != nullptr; } SaveStateList SupernovaMetaEngine::listSaves(const char *target) const { diff --git a/engines/supernova/graphics.cpp b/engines/supernova/graphics.cpp index e27c7c9d8f..5dc165e8ec 100644 --- a/engines/supernova/graphics.cpp +++ b/engines/supernova/graphics.cpp @@ -241,11 +241,11 @@ bool MSNImage::loadSections() { void MSNImage::destroy() { if (_palette) { delete[] _palette; - _palette = NULL; + _palette = nullptr; } if (_encodedImage) { delete[] _encodedImage; - _encodedImage = NULL; + _encodedImage = nullptr; } for (Common::Array<Graphics::Surface *>::iterator it = _sectionSurfaces.begin(); it != _sectionSurfaces.end(); ++it) { diff --git a/engines/supernova/resman.cpp b/engines/supernova/resman.cpp index d38405dddf..69f99b0907 100644 --- a/engines/supernova/resman.cpp +++ b/engines/supernova/resman.cpp @@ -193,7 +193,7 @@ static Common::MemoryReadStream *convertToMod(const char *filename, int version) msnFile.open(filename); if (!msnFile.isOpen()) { warning("Data file '%s' not found", msnFile.getName()); - return NULL; + return nullptr; } for (int i = 0 ; i < nbInstr2 ; ++i) { diff --git a/engines/supernova/supernova.cpp b/engines/supernova/supernova.cpp index f109d010c6..ce2ec1d1ef 100644 --- a/engines/supernova/supernova.cpp +++ b/engines/supernova/supernova.cpp @@ -77,9 +77,9 @@ ObjectType &operator^=(ObjectType &a, ObjectType b) { SupernovaEngine::SupernovaEngine(OSystem *syst) : Engine(syst) - , _console(NULL) - , _gm(NULL) - , _currentImage(NULL) + , _console(nullptr) + , _gm(nullptr) + , _currentImage(nullptr) , _rnd("supernova") , _brightness(255) , _menuBrightness(255) @@ -315,7 +315,7 @@ bool SupernovaEngine::setCurrentImage(int filenumber) { _currentImage = new MSNImage(); if (!_currentImage->init(filenumber)) { delete _currentImage; - _currentImage = NULL; + _currentImage = nullptr; return false; } diff --git a/engines/supernova/supernova.h b/engines/supernova/supernova.h index 3b24076095..f23149b8d1 100644 --- a/engines/supernova/supernova.h +++ b/engines/supernova/supernova.h @@ -53,7 +53,7 @@ struct ScreenBuffer { , _y(0) , _width(0) , _height(0) - , _pixels(NULL) + , _pixels(nullptr) {} byte *_pixels; |