[Scummvm-cvs-logs] scummvm master -> af64cad069071cc445ac015c87681a4f1244b413

eriktorbjorn eriktorbjorn at telia.com
Sun Dec 16 09:37:19 CET 2012


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:
af64cad069 JANITORIAL: Replace some spaces with tabs


Commit: af64cad069071cc445ac015c87681a4f1244b413
    https://github.com/scummvm/scummvm/commit/af64cad069071cc445ac015c87681a4f1244b413
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2012-12-16T00:35:52-08:00

Commit Message:
JANITORIAL: Replace some spaces with tabs

Changed paths:
    engines/cge/events.cpp
    engines/mohawk/myst.cpp
    engines/mohawk/riven.cpp



diff --git a/engines/cge/events.cpp b/engines/cge/events.cpp
index 1530c87..8980205 100644
--- a/engines/cge/events.cpp
+++ b/engines/cge/events.cpp
@@ -184,7 +184,7 @@ void Mouse::on() {
 		step(0);
 		if (_busy)
 			_busy->step(0);
-    }
+	}
 }
 
 void Mouse::off() {
diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
index 380bf3b..8140817 100644
--- a/engines/mohawk/myst.cpp
+++ b/engines/mohawk/myst.cpp
@@ -1181,41 +1181,41 @@ bool MohawkEngine_Myst::canSaveGameStateCurrently() {
 }
 
 void MohawkEngine_Myst::dropPage() {
-    uint16 page = _gameState->_globals.heldPage;
+	uint16 page = _gameState->_globals.heldPage;
 	bool whitePage = page == 13;
 	bool bluePage = page - 1 < 6;
-    bool redPage = page - 7 < 6;
-
-    // Play drop page sound
-    _sound->replaceSoundMyst(800);
-
-    // Drop page
-    _gameState->_globals.heldPage = 0;
-
-    // Redraw page area
-    if (whitePage && _gameState->_globals.currentAge == 2) {
-    	redrawArea(41);
-    } else if (bluePage) {
-    	if (page == 6) {
-    		if (_gameState->_globals.currentAge == 2)
-    			redrawArea(24);
-    	} else {
-    		redrawArea(103);
-    	}
-    } else if (redPage) {
-    	if (page == 12) {
-    		if (_gameState->_globals.currentAge == 2)
-    			redrawArea(25);
-    	} else if (page == 10) {
-    		if (_gameState->_globals.currentAge == 1)
-    			redrawArea(35);
-    	} else {
-    		redrawArea(102);
-    	}
-    }
-
-    setMainCursor(kDefaultMystCursor);
-    checkCursorHints();
+	bool redPage = page - 7 < 6;
+
+	// Play drop page sound
+	_sound->replaceSoundMyst(800);
+
+	// Drop page
+	_gameState->_globals.heldPage = 0;
+
+	// Redraw page area
+	if (whitePage && _gameState->_globals.currentAge == 2) {
+		redrawArea(41);
+	} else if (bluePage) {
+		if (page == 6) {
+			if (_gameState->_globals.currentAge == 2)
+				redrawArea(24);
+		} else {
+			redrawArea(103);
+		}
+	} else if (redPage) {
+		if (page == 12) {
+			if (_gameState->_globals.currentAge == 2)
+				redrawArea(25);
+		} else if (page == 10) {
+			if (_gameState->_globals.currentAge == 1)
+				redrawArea(35);
+		} else {
+			redrawArea(102);
+		}
+	}
+
+	setMainCursor(kDefaultMystCursor);
+	checkCursorHints();
 }
 
 } // End of namespace Mohawk
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index 9a18d68..71aa371 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -177,7 +177,7 @@ Common::Error MohawkEngine_Riven::run() {
 		}
 	} else {
 		// Otherwise, start us off at aspit's card 1 (the main menu)
-        changeToStack(aspit);
+		changeToStack(aspit);
 		changeToCard(1);
 	}
 






More information about the Scummvm-git-logs mailing list