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

[sev-]

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:
35933f3f30 DIRECTOR: Remove noisy warning
dc17277a79 DIRECTOR: Fix movie framerate


Commit: 35933f3f3096f7a0bccdba2ef29288a2cd2730f8
    https://github.com/scummvm/scummvm/commit/35933f3f3096f7a0bccdba2ef29288a2cd2730f8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-12-01T17:59:40+01:00

Commit Message:
DIRECTOR: Remove noisy warning

Changed paths:
    engines/director/frame.cpp


diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index c2597ec..87f6b43 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -627,7 +627,6 @@ void Frame::renderSprites(Graphics::ManagedSurface &surface, bool renderTrail) {
 				int y = _sprites[i]->_startPoint.y - regY + rectTop;
 				int height = _sprites[i]->_height;
 				int width = _vm->getVersion() > 4 ? _sprites[i]->_bitmapCast->_initialRect.width() : _sprites[i]->_width;
-				warning("drawRect: x=%d, y=%d, w=%d h=%d", x, y, width, height);
 				Common::Rect drawRect(x, y, x + width, y + height);
 				addDrawRect(i, drawRect);
 				inkBasedBlit(surface, *(_sprites[i]->_bitmapCast->_surface), i, drawRect);


Commit: dc17277a790cf343c3064722bf84eef7cf837d5e
    https://github.com/scummvm/scummvm/commit/dc17277a790cf343c3064722bf84eef7cf837d5e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-12-01T17:59:40+01:00

Commit Message:
DIRECTOR: Fix movie framerate

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


diff --git a/engines/director/events.cpp b/engines/director/events.cpp
index 603582b..253c871 100644
--- a/engines/director/events.cpp
+++ b/engines/director/events.cpp
@@ -43,7 +43,7 @@ void processQuitEvent() {
 void DirectorEngine::processEvents() {
 	Common::Event event;
 
-	uint endTime = g_system->getMillis() + 200;
+	uint endTime = g_system->getMillis() + 10;
 
 	Score *sc = getCurrentScore();
 	if (sc->getCurrentFrame() >= sc->_frames.size()) {
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index ea90b2e..36e32c2 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -476,6 +476,8 @@ void Score::loadConfig(Common::SeekableSubReadStreamEndian &stream) {
 	_castArrayStart = stream.readUint16();
 	_castArrayEnd = stream.readUint16();
 	_currentFrameRate = stream.readByte();
+
+	debugC(1, kDebugLoading, "Config. Framerate: %d", _currentFrameRate);
 	stream.skip(9);
 	_stageColor = stream.readUint16();
 }
@@ -1359,7 +1361,7 @@ void Score::update() {
 
 	_lingo->processEvent(kEventExitFrame);
 
-	_nextFrameTime = g_system->getMillis() + (float)_currentFrameRate / 60 * 1000;
+	_nextFrameTime = g_system->getMillis() + 1000.0 / (float)_currentFrameRate;
 }
 
 Sprite *Score::getSpriteById(uint16 id) {