[Scummvm-git-logs] scummvm master -> 37985991e867b005831fbf975d7b77e2fc244ef9

sev- sev at scummvm.org
Sun Feb 26 23:08:31 CET 2017


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

Summary:
f47602f87d DIRECTOR: More debug output on image rendering
37985991e8 DIRECTOR: Fix rendering of shapes of type 16


Commit: f47602f87d73155ba8eb51cf7f67ba9a481b51de
    https://github.com/scummvm/scummvm/commit/f47602f87d73155ba8eb51cf7f67ba9a481b51de
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-26T23:08:22+01:00

Commit Message:
DIRECTOR: More debug output on image rendering

Changed paths:
    engines/director/frame.cpp
    engines/director/score.cpp


diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index fd0ee98..fdb342f 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -548,6 +548,7 @@ void Frame::renderSprites(Graphics::ManagedSurface &surface, bool renderTrail) {
 			CastType castType = kCastTypeNull;
 			Cast *cast = nullptr;
 			if (_vm->getVersion() < 4) {
+				debugC(1, kDebugImages, "Channel: %d type: %d", i, _sprites[i]->_spriteType);
 				switch (_sprites[i]->_spriteType) {
 				case 0x01:
 					castType = kCastBitmap;
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 58d9b4b..705dac8 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -890,7 +890,7 @@ void Score::startLoop() {
 	_frames[_currentFrame]->prepareFrame(this);
 
 	while (!_stopPlay && _currentFrame < _frames.size()) {
-		debugC(1, kDebugImages, "Current frame: %d", _currentFrame);
+		debugC(1, kDebugImages, "******************************  Current frame: %d", _currentFrame + 1);
 		update();
 		processEvents();
 	}


Commit: 37985991e867b005831fbf975d7b77e2fc244ef9
    https://github.com/scummvm/scummvm/commit/37985991e867b005831fbf975d7b77e2fc244ef9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-26T23:08:22+01:00

Commit Message:
DIRECTOR: Fix rendering of shapes of type 16

Changed paths:
    engines/director/frame.cpp


diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index fdb342f..176bc47 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -550,14 +550,15 @@ void Frame::renderSprites(Graphics::ManagedSurface &surface, bool renderTrail) {
 			if (_vm->getVersion() < 4) {
 				debugC(1, kDebugImages, "Channel: %d type: %d", i, _sprites[i]->_spriteType);
 				switch (_sprites[i]->_spriteType) {
-				case 0x01:
+				case 1:
 					castType = kCastBitmap;
 					break;
-				case 0x02:
-				case 0x0c: // this is actually a mouse-over shape? I don't think it's a real button.
+				case 2:
+				case 12: // this is actually a mouse-over shape? I don't think it's a real button.
+				case 16: // Face kit D3
 					castType = kCastShape;
 					break;
-				case 0x07:
+				case 7:
 					castType = kCastText;
 					break;
 				}





More information about the Scummvm-git-logs mailing list