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

sev- sev at scummvm.org
Mon Feb 13 08:49:05 CET 2017


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:
ce82d67b63 DIRECTOR: Turn assert into a warning when sprite cast is missing


Commit: ce82d67b63d1d84079eb627721637d38d97e4a12
    https://github.com/scummvm/scummvm/commit/ce82d67b63d1d84079eb627721637d38d97e4a12
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-13T08:51:20+01:00

Commit Message:
DIRECTOR: Turn assert into a warning when sprite cast is missing

Changed paths:
    engines/director/frame.cpp


diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index 3dcfd57..fa9063d 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -595,7 +595,10 @@ void Frame::renderSprites(Graphics::ManagedSurface &surface, bool renderTrail) {
 					continue;
 				}
 
-				assert(_sprites[i]->_cast);
+				if (!_sprites[i]->_cast) {
+					warning("No cast ID for sprite %d", i);
+					continue;
+				}
 
 				BitmapCast *bitmapCast = static_cast<BitmapCast *>(_sprites[i]->_cast);
 				// TODO: might want a quicker way to determine if cast is from Shared Cast.





More information about the Scummvm-git-logs mailing list