aboutsummaryrefslogtreecommitdiff
path: root/engines/mohawk/bitmap.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/mohawk/bitmap.cpp')
-rw-r--r--engines/mohawk/bitmap.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/mohawk/bitmap.cpp b/engines/mohawk/bitmap.cpp
index d8c6d6aacd..205feb824f 100644
--- a/engines/mohawk/bitmap.cpp
+++ b/engines/mohawk/bitmap.cpp
@@ -70,7 +70,7 @@ MohawkBitmap::~MohawkBitmap() {
void MohawkBitmap::decodeImageData(Common::SeekableReadStream *stream) {
_data = stream;
- _header.colorTable.palette = NULL;
+ _header.colorTable.palette = nullptr;
// NOTE: Only the bottom 12 bits of width/height/bytesPerRow are
// considered valid and bytesPerRow has to be an even number.
@@ -650,7 +650,7 @@ MohawkSurface *MystBitmap::decodeImage(Common::SeekableReadStream *stream) {
error("Could not decode Myst bitmap");
const Graphics::Surface *bmpSurface = bitmapDecoder.getSurface();
- Graphics::Surface *newSurface = 0;
+ Graphics::Surface *newSurface = nullptr;
if (bmpSurface->format.bytesPerPixel == 1) {
_bitsPerPixel = 8;
@@ -662,7 +662,7 @@ MohawkSurface *MystBitmap::decodeImage(Common::SeekableReadStream *stream) {
}
// Copy the palette to one of our own
- byte *newPal = 0;
+ byte *newPal = nullptr;
if (bitmapDecoder.hasPalette()) {
const byte *palette = bitmapDecoder.getPalette();
@@ -729,7 +729,7 @@ MohawkSurface *LivingBooksBitmap_v1::decodeImage(Common::SeekableReadStream *str
leRLE8 = true;
_data = stream;
- stream = NULL;
+ stream = nullptr;
}
Graphics::Surface *surface = createSurface(_header.width, _header.height);