aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/engine/kscripts.cpp2
-rw-r--r--engines/sci/video/robot_decoder.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/engine/kscripts.cpp b/engines/sci/engine/kscripts.cpp
index 5a330237e9..8fd05a7dc9 100644
--- a/engines/sci/engine/kscripts.cpp
+++ b/engines/sci/engine/kscripts.cpp
@@ -158,7 +158,7 @@ reg_t kResCheck(EngineState *s, int argc, reg_t *argv) {
// GK2 stores some VMDs inside of resource volumes, but usually videos are
// streamed from the filesystem.
if (res == nullptr) {
- const char *format = nullptr;
+ const char *format;
switch (restype) {
case kResourceTypeRobot:
format = "%u.rbt";
diff --git a/engines/sci/video/robot_decoder.cpp b/engines/sci/video/robot_decoder.cpp
index c0b5ee5e5c..7eaa5cff38 100644
--- a/engines/sci/video/robot_decoder.cpp
+++ b/engines/sci/video/robot_decoder.cpp
@@ -1509,7 +1509,7 @@ uint32 RobotDecoder::createCel5(const byte *rawVideoData, const int16 screenItem
assert(bitmap.getHunkPaletteOffset() == (uint32)bitmap.getWidth() * bitmap.getHeight() + SciBitmap::getBitmapHeaderSize());
bitmap.setOrigin(origin);
- byte *targetBuffer = nullptr;
+ byte *targetBuffer;
if (_verticalScaleFactor == 100) {
// direct copy to bitmap
targetBuffer = bitmap.getPixels();