diff --git a/engines/cge2/detection.cpp b/engines/cge2/detection.cpp index 8ed992917cb..b7ca5dcea85 100644 --- a/engines/cge2/detection.cpp +++ b/engines/cge2/detection.cpp @@ -43,7 +43,7 @@ namespace CGE2 { static const PlainGameDescriptor CGE2Games[] = { { "sfinx", "Sfinx" }, - { 0, 0 } + { nullptr, nullptr } }; static const ADGameDescription gameDescriptions[] = { @@ -162,7 +162,7 @@ public: static ADGameDescription s_fallbackDesc = { "sfinx", "Unknown version", - AD_ENTRY1(0, 0), // This should always be AD_ENTRY1(0, 0) in the fallback descriptor + AD_ENTRY1(nullptr, nullptr), // This should always be AD_ENTRY1(0, 0) in the fallback descriptor Common::UNK_LANG, Common::kPlatformDOS, ADGF_NO_FLAGS, @@ -170,8 +170,8 @@ static ADGameDescription s_fallbackDesc = { }; static const ADFileBasedFallback fileBasedFallback[] = { - { &s_fallbackDesc, { "vol.cat", "vol.dat", 0 } }, - { 0, { 0 } } + { &s_fallbackDesc, { "vol.cat", "vol.dat", nullptr } }, + { nullptr, { nullptr } } }; // This fallback detection looks identical to the one used for CGE. In fact, the difference resides diff --git a/engines/cge2/events.cpp b/engines/cge2/events.cpp index bd01965f4a2..574236f6181 100644 --- a/engines/cge2/events.cpp +++ b/engines/cge2/events.cpp @@ -56,7 +56,7 @@ bool Keyboard::getKey(Common::Event &event) { return false; // Display ScummVM version and translation strings for (int i = 0; i < 3; i++) - _vm->_commandHandler->addCommand(kCmdInf, 1, kShowScummVMVersion + i, NULL); + _vm->_commandHandler->addCommand(kCmdInf, 1, kShowScummVMVersion + i, nullptr); return false; case Common::KEYCODE_F5: _vm->saveGameDialog(); diff --git a/engines/cge2/sound.cpp b/engines/cge2/sound.cpp index 90903081dac..7cc54d20e0a 100644 --- a/engines/cge2/sound.cpp +++ b/engines/cge2/sound.cpp @@ -170,7 +170,7 @@ DataCk *Fx::loadWave(EncryptedStream *file) { byte *data = (byte *)malloc(file->size()); if (!data) - return 0; + return nullptr; file->read(data, file->size());