[Scummvm-git-logs] scummvm master -> 16439b346f4b0a6e008e61d65af34348d6ce9420

stevenhoefel stevenhoefel at hotmail.com
Thu Jan 12 06:24:21 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:
16439b346f DIRECTOR: Use shared cast member data when rendering shared cast item.


Commit: 16439b346f4b0a6e008e61d65af34348d6ce9420
    https://github.com/scummvm/scummvm/commit/16439b346f4b0a6e008e61d65af34348d6ce9420
Author: stevenhoefel (stevenhoefel at hotmail.com)
Date: 2017-01-12T16:24:12+11:00

Commit Message:
DIRECTOR: Use shared cast member data when rendering shared cast item.

Changed paths:
    engines/director/frame.cpp


diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index ffe004f..8bf71b6 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -594,10 +594,16 @@ void Frame::renderSprites(Graphics::ManagedSurface &surface, bool renderTrail) {
 
 				assert(_sprites[i]->_cast);
 
-				uint32 regX = static_cast<BitmapCast *>(_sprites[i]->_cast)->regX;
-				uint32 regY = static_cast<BitmapCast *>(_sprites[i]->_cast)->regY;
-				uint32 rectLeft = static_cast<BitmapCast *>(_sprites[i]->_cast)->initialRect.left;
-				uint32 rectTop = static_cast<BitmapCast *>(_sprites[i]->_cast)->initialRect.top;
+				BitmapCast *bitmapCast = static_cast<BitmapCast *>(_sprites[i]->_cast);
+				//TODO: might want a quicker way to determine if cast is from Shared Cast.
+				if (_vm->getSharedBMP() != NULL && _vm->getSharedBMP()->contains(_sprites[i]->_castId + 1024)) {
+					bitmapCast = static_cast<BitmapCast *>(_vm->getSharedCasts()->getVal(_sprites[i]->_castId));
+				}
+
+				uint32 regX = bitmapCast->regX;
+				uint32 regY = bitmapCast->regY;
+				uint32 rectLeft = bitmapCast->initialRect.left;
+				uint32 rectTop = bitmapCast->initialRect.top;
 
 				int x = _sprites[i]->_startPoint.x - regX + rectLeft;
 				int y = _sprites[i]->_startPoint.y - regY + rectTop;





More information about the Scummvm-git-logs mailing list