aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorD G Turner2017-01-12 03:27:36 +0000
committerD G Turner2017-01-12 03:27:36 +0000
commitb914aa88612bf64055609de7ca7bfd9dd0b49714 (patch)
tree796f0dbbd47c768c8bebd8c3849a13b5c183fea7 /engines
parent1e47d4a13c591b35ebee848aeb9e7cfc41a8b67f (diff)
downloadscummvm-rg350-b914aa88612bf64055609de7ca7bfd9dd0b49714.tar.gz
scummvm-rg350-b914aa88612bf64055609de7ca7bfd9dd0b49714.tar.bz2
scummvm-rg350-b914aa88612bf64055609de7ca7bfd9dd0b49714.zip
DIRECTOR: Fix Further Compiler Warnings.
Diffstat (limited to 'engines')
-rw-r--r--engines/director/cast.h1
-rw-r--r--engines/director/frame.cpp4
2 files changed, 3 insertions, 2 deletions
diff --git a/engines/director/cast.h b/engines/director/cast.h
index 6ca1d03d3b..a0abe97516 100644
--- a/engines/director/cast.h
+++ b/engines/director/cast.h
@@ -30,6 +30,7 @@
namespace Director {
enum CastType {
+ kCastTypeNull = 0,
kCastBitmap = 1,
kCastFilmLoop = 2,
kCastText = 3,
diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index a4b3b6abd1..ffe004f7a2 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -541,8 +541,8 @@ void Frame::renderSprites(Graphics::ManagedSurface &surface, bool renderTrail) {
if ((_sprites[i]->_trails == 0 && renderTrail) || (_sprites[i]->_trails == 1 && !renderTrail))
continue;
- CastType castType;
- Cast *cast;
+ CastType castType = kCastTypeNull;
+ Cast *cast = nullptr;
if (_vm->getVersion() < 4) {
switch (_sprites[i]->_spriteType) {
case 0x01: