aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/base/file/base_disk_file.cpp
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2013-01-26 18:06:42 +0100
committerEinar Johan Trøan Sømåen2013-01-26 18:07:07 +0100
commit980dc4a456f55a8b6526d2bc6f7694a0b2d666b3 (patch)
treebef13619df90984b731795e72721da7d39089041 /engines/wintermute/base/file/base_disk_file.cpp
parent6ae97cdfbe88fa34363aabc46847b0c9a32eefe5 (diff)
downloadscummvm-rg350-980dc4a456f55a8b6526d2bc6f7694a0b2d666b3.tar.gz
scummvm-rg350-980dc4a456f55a8b6526d2bc6f7694a0b2d666b3.tar.bz2
scummvm-rg350-980dc4a456f55a8b6526d2bc6f7694a0b2d666b3.zip
WINTERMUTE: Replace all NULLs with nullptr.
Diffstat (limited to 'engines/wintermute/base/file/base_disk_file.cpp')
-rw-r--r--engines/wintermute/base/file/base_disk_file.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp
index 25be3dad2d..796531eb27 100644
--- a/engines/wintermute/base/file/base_disk_file.cpp
+++ b/engines/wintermute/base/file/base_disk_file.cpp
@@ -109,7 +109,7 @@ bool diskFileExists(const Common::String &filename) {
Common::SeekableReadStream *openDiskFile(const Common::String &filename) {
uint32 prefixSize = 0;
- Common::SeekableReadStream *file = NULL;
+ Common::SeekableReadStream *file = nullptr;
Common::String fixedFilename = filename;
// Absolute path: TODO: Add specific fallbacks here.
@@ -157,7 +157,7 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) {
if (!compBuffer) {
error("Error allocating memory for compressed file '%s'", filename.c_str());
delete file;
- return NULL;
+ return nullptr;
}
byte *data = new byte[uncompSize];
@@ -165,7 +165,7 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) {
error("Error allocating buffer for file '%s'", filename.c_str());
delete[] compBuffer;
delete file;
- return NULL;
+ return nullptr;
}
file->seek(dataOffset + prefixSize, SEEK_SET);
file->read(compBuffer, compSize);
@@ -174,7 +174,7 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) {
error("Error uncompressing file '%s'", filename.c_str());
delete[] compBuffer;
delete file;
- return NULL;
+ return nullptr;
}
delete[] compBuffer;
@@ -188,7 +188,7 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) {
return file;
}
- return NULL;
+ return nullptr;
}
} // end of namespace Wintermute