aboutsummaryrefslogtreecommitdiff
path: root/engines/mohawk/mohawk.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/mohawk/mohawk.cpp')
-rw-r--r--engines/mohawk/mohawk.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/mohawk/mohawk.cpp b/engines/mohawk/mohawk.cpp
index 53481af8a7..52f73dbbb1 100644
--- a/engines/mohawk/mohawk.cpp
+++ b/engines/mohawk/mohawk.cpp
@@ -41,8 +41,8 @@ MohawkEngine::MohawkEngine(OSystem *syst, const MohawkGameDescription *gamedesc)
// Setup mixer
syncSoundSettings();
- _pauseDialog = 0;
- _cursor = 0;
+ _pauseDialog = nullptr;
+ _cursor = nullptr;
}
MohawkEngine::~MohawkEngine() {
@@ -70,7 +70,6 @@ Common::SeekableReadStream *MohawkEngine::getResource(uint32 tag, uint16 id) {
return _mhk[i]->getResource(tag, id);
error("Could not find a '%s' resource with ID %04x", tag2str(tag), id);
- return NULL;
}
bool MohawkEngine::hasResource(uint32 tag, uint16 id) {
@@ -95,7 +94,6 @@ uint32 MohawkEngine::getResourceOffset(uint32 tag, uint16 id) {
return _mhk[i]->getOffset(tag, id);
error("Could not find a '%s' resource with ID %04x", tag2str(tag), id);
- return 0;
}
uint16 MohawkEngine::findResourceID(uint32 tag, const Common::String &resName) {
@@ -104,7 +102,6 @@ uint16 MohawkEngine::findResourceID(uint32 tag, const Common::String &resName) {
return _mhk[i]->findResourceID(tag, resName);
error("Could not find a '%s' resource matching name '%s'", tag2str(tag), resName.c_str());
- return 0xFFFF;
}
Common::String MohawkEngine::getResourceName(uint32 tag, uint16 id) {
@@ -114,7 +111,6 @@ Common::String MohawkEngine::getResourceName(uint32 tag, uint16 id) {
}
error("Could not find a \'%s\' resource with ID %04x", tag2str(tag), id);
- return 0;
}
} // End of namespace Mohawk