[Scummvm-git-logs] scummvm master -> 20ee021407888dd47fe52d83c60d3c82df207cb7
sev-
noreply at scummvm.org
Tue Jun 13 22:30:13 UTC 2023
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:
20ee021407 DIRECTOR: Loosened check for extra data in filmloop
Commit: 20ee021407888dd47fe52d83c60d3c82df207cb7
https://github.com/scummvm/scummvm/commit/20ee021407888dd47fe52d83c60d3c82df207cb7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-06-14T00:30:01+02:00
Commit Message:
DIRECTOR: Loosened check for extra data in filmloop
Changed paths:
engines/director/castmember/filmloop.cpp
diff --git a/engines/director/castmember/filmloop.cpp b/engines/director/castmember/filmloop.cpp
index 973e1285cd0..a3e04796fc2 100644
--- a/engines/director/castmember/filmloop.cpp
+++ b/engines/director/castmember/filmloop.cpp
@@ -362,9 +362,11 @@ void FilmLoopCastMember::loadFilmLoopDataV4(Common::SeekableReadStreamEndian &st
if (s->_key == -1) {
debugC(5, kDebugLoading, "loadFilmLoopDataV4: Skipping channel -1");
- if (s->_value._castId != CastMemberID(0, 0) || s->_value._startPoint.x != 0 ||
- s->_value._startPoint.y != 0 || s->_value._width != 0 || s->_value._height != -256)
- warning("BUILDBOT: loadFilmLoopDataV4: Malformed VWSC resource");
+ if (s->_value._startPoint.x != 0 || s->_value._startPoint.y != 0 || s->_value._width != 0 ||
+ (s->_value._height != -256 && s->_value._height != 0))
+ warning("BUILDBOT: loadFilmLoopDataV4: Malformed VWSC resource: Sprite: channel %d, castId %s, bbox %d %d %d %d", s->_key,
+ s->_value._castId.asString().c_str(), s->_value._startPoint.x, s->_value._startPoint.y,
+ s->_value._width, s->_value._height);
continue;
}
More information about the Scummvm-git-logs
mailing list