Merge branch 'master' of github.com:scummvm/scummvm into soltys_wip2

1 files changed, 4 insertions, 4 deletions

diff --git a/engines/mohawk/riven_external.cpp b/engines/mohawk/riven_external.cpp
index 8ad05ded13..60e94ea795 100644
--- a/engines/mohawk/riven_external.cpp
+++ b/engines/mohawk/riven_external.cpp
@@ -244,7 +244,7 @@ void RivenExternal::runCredits(uint16 video, uint32 delay) {
 				_vm->_gfx->updateCredits();
 			}
 		} else if (_vm->_video->updateMovies())
-			_vm->_system->updateScreen(); 
+			_vm->_system->updateScreen();
 
 		Common::Event event;
 		while (_vm->_system->getEventManager()->pollEvent(event))
@@ -2060,7 +2060,7 @@ void RivenExternal::xbookclick(uint16 argc, uint16 *argv) {
 		_vm->_cursor->setCursor(kRivenMainCursor);
 
 	_vm->_system->updateScreen();
-	
+
 	// OK, Gehn has opened the trap book and has asked us to go in. Let's watch
 	// and see what the player will do...
 	while (_vm->_video->getElapsedTime(video) < endTime && !_vm->shouldQuit()) {
@@ -2216,7 +2216,7 @@ void RivenExternal::xgwatch(uint16 argc, uint16 *argv) {
 			curSound++;
 			soundTime = _vm->_system->getMillis();
 		}
-		
+
 		// Poll events just to check for quitting
 		Common::Event event;
 		while (_vm->_system->getEventManager()->pollEvent(event)) {}
@@ -2525,7 +2525,7 @@ static Common::Rect generateMarbleGridRect(uint16 x, uint16 y) {
 }
 
 void RivenExternal::xt7500_checkmarbles(uint16 argc, uint16 *argv) {
-	// Set apower if the marbles are in their correct spot. 
+	// Set apower if the marbles are in their correct spot.
 
 	bool valid = true;
 	static const uint32 marbleFinalValues[] = { 1114121, 1441798, 0, 65552, 65558, 262146 };