[Scummvm-git-logs] scummvm master -> b914aa88612bf64055609de7ca7bfd9dd0b49714

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b914aa8861 DIRECTOR: Fix Further Compiler Warnings.


Commit: b914aa88612bf64055609de7ca7bfd9dd0b49714
    https://github.com/scummvm/scummvm/commit/b914aa88612bf64055609de7ca7bfd9dd0b49714
Author: D G Turner (digitall at scummvm.org)
Date: 2017-01-12T03:27:36Z

Commit Message:
DIRECTOR: Fix Further Compiler Warnings.

Changed paths:
    engines/director/cast.h
    engines/director/frame.cpp


diff --git a/engines/director/cast.h b/engines/director/cast.h
index 6ca1d03..a0abe97 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 a4b3b6a..ffe004f 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: