[Scummvm-git-logs] scummvm master -> 8c13a263aef01e191ab4b031210186553025cf53

sev- sev at scummvm.org
Tue Feb 14 19:05:41 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:
8c13a263ae DIRECTOR: Lingo: Fix rest of the 'go to' family functions


Commit: 8c13a263aef01e191ab4b031210186553025cf53
    https://github.com/scummvm/scummvm/commit/8c13a263aef01e191ab4b031210186553025cf53
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-14T19:08:05+01:00

Commit Message:
DIRECTOR: Lingo: Fix rest of the 'go to' family functions

Changed paths:
    engines/director/lingo/lingo-funcs.cpp
    engines/director/score.cpp


diff --git a/engines/director/lingo/lingo-funcs.cpp b/engines/director/lingo/lingo-funcs.cpp
index 5ddfd0d..ddc51f4 100644
--- a/engines/director/lingo/lingo-funcs.cpp
+++ b/engines/director/lingo/lingo-funcs.cpp
@@ -242,6 +242,8 @@ void Lingo::func_gotoloop() {
 		return;
 
 	_vm->getCurrentScore()->gotoLoop();
+
+	g_director->_skipFrameAdvance = true;
 }
 
 void Lingo::func_gotonext() {
@@ -249,6 +251,8 @@ void Lingo::func_gotonext() {
 		return;
 
 	_vm->getCurrentScore()->gotoNext();
+
+	g_director->_skipFrameAdvance = true;
 }
 
 void Lingo::func_gotoprevious() {
@@ -256,6 +260,8 @@ void Lingo::func_gotoprevious() {
 		return;
 
 	_vm->getCurrentScore()->gotoPrevious();
+
+	g_director->_skipFrameAdvance = true;
 }
 
 void Lingo::func_cursor(int c) {
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index ca016d0..76393e5 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -639,6 +639,8 @@ void Score::gotoLoop() {
 			}
 		}
 	}
+
+	g_director->_skipFrameAdvance = true;
 }
 
 int Score::getCurrentLabelNumber() {
@@ -657,11 +659,15 @@ int Score::getCurrentLabelNumber() {
 void Score::gotoNext() {
 	// we can just try to use the current frame and get the next label
 	_currentFrame = getNextLabelNumber(_currentFrame);
+
+	g_director->_skipFrameAdvance = true;
 }
 
 void Score::gotoPrevious() {
 	// we actually need the frame of the label prior to the most recent label.
 	_currentFrame = getPreviousLabelNumber(getCurrentLabelNumber());
+
+	g_director->_skipFrameAdvance = true;
 }
 
 int Score::getNextLabelNumber(int referenceFrame) {





More information about the Scummvm-git-logs mailing list