[Scummvm-git-logs] scummvm master -> 832a0dcf1261b7eec7873c4682d5d2e6ebf7f668

[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:
8864fbf44d DIRECTOR: Lingo: Fix 'pause' implementation
832a0dcf12 JANITORIAL: Formatting fixes


Commit: 8864fbf44d7d4f8e5196139493582037ffa2c301
    https://github.com/scummvm/scummvm/commit/8864fbf44d7d4f8e5196139493582037ffa2c301
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-15T20:03:58+01:00

Commit Message:
DIRECTOR: Lingo: Fix 'pause' implementation

Changed paths:
    engines/director/lingo/lingo-builtins.cpp


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 8ae595c..f4c26a2 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -896,8 +896,6 @@ void Lingo::b_pass(int nargs) {
 
 void Lingo::b_pause(int nargs) {
 	g_director->_playbackPaused = true;
-
-	g_lingo->pushVoid();	// Fake value
 }
 
 void Lingo::b_playAccel(int nargs) {


Commit: 832a0dcf1261b7eec7873c4682d5d2e6ebf7f668
    https://github.com/scummvm/scummvm/commit/832a0dcf1261b7eec7873c4682d5d2e6ebf7f668
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-15T20:05:11+01:00

Commit Message:
JANITORIAL: Formatting fixes

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 76393e5..53d1546 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -877,7 +877,7 @@ void Score::update() {
 		}
 	}
 
-	// TODO Director 6 step: send prepareFrame event to all sprites and the script channel in upcoming frame
+	// TODO: Director 6 step: send prepareFrame event to all sprites and the script channel in upcoming frame
 	if (_vm->getVersion() >= 6)
 		_lingo->processEvent(kEventPrepareFrame, kFrameScript, _currentFrame);
 
@@ -936,7 +936,7 @@ void Score::update() {
 }
 
 void Score::processEvents() {
-	//TODO: re-instate when we know which script to run.
+	// TODO: re-instate when we know which script to run.
 	//if (_currentFrame > 0)
 	//	_lingo->processEvent(kEventIdle, _currentFrame - 1);
 
@@ -952,9 +952,9 @@ void Score::processEvents() {
 			if (event.type == Common::EVENT_LBUTTONDOWN) {
 				Common::Point pos = g_system->getEventManager()->getMousePos();
 
-				//D3 doesn't have both mouse up and down.
+				// D3 doesn't have both mouse up and down.
 				if (_vm->getVersion() > 3) {
-					//TODO: check that this is the order of script execution!
+					// TODO: check that this is the order of script execution!
 					uint16 spriteId = _frames[_currentFrame]->getSpriteIDFromPos(pos);
 					_lingo->processEvent(kEventMouseDown, kCastScript, _frames[_currentFrame]->_sprites[spriteId]->_castId);
 					_lingo->processEvent(kEventMouseDown, kSpriteScript, _frames[_currentFrame]->_sprites[spriteId]->_scriptId);
@@ -966,11 +966,11 @@ void Score::processEvents() {
 
 				uint16 spriteId = _frames[_currentFrame]->getSpriteIDFromPos(pos);
 				if (_vm->getVersion() > 3) {
-					//TODO: check that this is the order of script execution!
+					// TODO: check that this is the order of script execution!
 					_lingo->processEvent(kEventMouseUp, kCastScript, _frames[_currentFrame]->_sprites[spriteId]->_castId);
 					_lingo->processEvent(kEventMouseUp, kSpriteScript, _frames[_currentFrame]->_sprites[spriteId]->_scriptId);
 				} else {
-					//D3 doesn't have cast member or sprite scripts. Just Frame Scripts.
+					// D3 doesn't have cast member or sprite scripts. Just Frame Scripts.
 					_lingo->processEvent(kEventMouseUp, kFrameScript, _frames[_currentFrame]->_sprites[spriteId]->_scriptId);
 				}
 			}
@@ -996,7 +996,7 @@ void Score::processEvents() {
 					warning("Keycode: %d", _vm->_keyCode);
 				}
 
-				//TODO: is movie script correct? Can this be elsewhere?
+				// TODO: is movie script correct? Can this be elsewhere?
 				_lingo->processEvent(kEventKeyDown, kMovieScript, 0);
 			}
 		}