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

Strangerke Strangerke at scummvm.org
Sun Nov 24 19:31:19 CET 2013


This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cfbe557bdc SAGA: Janitorial - Fix spacing errors
86231d14d5 MADE: Janitorial - Fix spacing errors
b3356464e4 AGOS: Janitorial - Fix spacing errors
29a63886aa TINSEL: Janitorial - Fix spacing errors
a8de5dfad8 LASTEXPRESS: Janitorial - Fix spacing errors


Commit: cfbe557bdcb65d1074a883e8deddfa933438d36c
    https://github.com/scummvm/scummvm/commit/cfbe557bdcb65d1074a883e8deddfa933438d36c
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-24T10:14:45-08:00

Commit Message:
SAGA: Janitorial - Fix spacing errors

Changed paths:
    engines/saga/saga.h



diff --git a/engines/saga/saga.h b/engines/saga/saga.h
index 01cab21..645e1c3 100644
--- a/engines/saga/saga.h
+++ b/engines/saga/saga.h
@@ -138,7 +138,7 @@ enum GameFileTypes {
 enum GameFeatures {
 	GF_ITE_FLOPPY        = 1 << 0,
 #if 0
-	GF_OLD_ITE_DOS       = 1 << 1, 	// Currently unused
+	GF_OLD_ITE_DOS       = 1 << 1,     // Currently unused
 #endif
 	GF_EXTRA_ITE_CREDITS = 1 << 2,
 	GF_8BIT_UNSIGNED_PCM = 1 << 3


Commit: 86231d14d5401e242e6d3170dc8b769e40204709
    https://github.com/scummvm/scummvm/commit/86231d14d5401e242e6d3170dc8b769e40204709
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-24T10:17:18-08:00

Commit Message:
MADE: Janitorial - Fix spacing errors

Changed paths:
    engines/made/detection.cpp
    engines/made/screenfx.cpp
    engines/made/sound.cpp



diff --git a/engines/made/detection.cpp b/engines/made/detection.cpp
index e8b755c..c2c866f 100644
--- a/engines/made/detection.cpp
+++ b/engines/made/detection.cpp
@@ -211,77 +211,77 @@ static const MadeGameDescription gameDescriptions[] = {
 		3,
 	},
 
- 	{
- 		// Return to Zork - Italian CD version 1.2 3/31/95 (installed)
+	{
+		// Return to Zork - Italian CD version 1.2 3/31/95 (installed)
 		// Patch #2685032 submitted by goodoldgeorg
- 		{
- 			"rtz",
- 			"V1.2, 3/31/95, installed, CD",
- 			AD_ENTRY1s("rtzcd.dat", "5b86035aed0277f96e3d173542b5364a", 523776),
- 			Common::IT_ITA,
- 			Common::kPlatformDOS,
+		{
+			"rtz",
+			"V1.2, 3/31/95, installed, CD",
+			AD_ENTRY1s("rtzcd.dat", "5b86035aed0277f96e3d173542b5364a", 523776),
+			Common::IT_ITA,
+			Common::kPlatformDOS,
 			ADGF_CD,
 			GUIO0()
- 		},
- 		GID_RTZ,
- 		0,
- 		GF_CD,
- 		3,
- 	},
+		},
+		GID_RTZ,
+		0,
+		GF_CD,
+		3,
+	},
 
 	{
- 		// Return to Zork - Italian CD version 1.2 3/31/95
+		// Return to Zork - Italian CD version 1.2 3/31/95
 		// Patch #2685032 submitted by goodoldgeorg
- 		{
- 			"rtz",
- 			"V1.2, 3/31/95, CD",
- 			AD_ENTRY1s("rtzcd.red", "946997d8b0aa6cb4e848bad02a1fc3d2", 354971),
- 			Common::IT_ITA,
- 			Common::kPlatformDOS,
+		{
+			"rtz",
+			"V1.2, 3/31/95, CD",
+			AD_ENTRY1s("rtzcd.red", "946997d8b0aa6cb4e848bad02a1fc3d2", 354971),
+			Common::IT_ITA,
+			Common::kPlatformDOS,
 			ADGF_CD,
 			GUIO0()
- 		},
- 		GID_RTZ,
- 		0,
- 		GF_CD_COMPRESSED,
- 		3,
- 	},
-
- 	{
- 		// Return to Zork - French CD version 1.2 5/13/95 (installed)
+		},
+		GID_RTZ,
+		0,
+		GF_CD_COMPRESSED,
+		3,
+	},
+
+	{
+		// Return to Zork - French CD version 1.2 5/13/95 (installed)
 		// Patch #2685032 submitted by goodoldgeorg
- 		{
- 			"rtz",
- 			"V1.2, 5/13/95, installed, CD",
- 			AD_ENTRY1s("rtzcd.dat", "bde8251a8e34e87c54e3f93147d56c9e", 523776),
- 			Common::FR_FRA,
- 			Common::kPlatformDOS,
+		{
+			"rtz",
+			"V1.2, 5/13/95, installed, CD",
+			AD_ENTRY1s("rtzcd.dat", "bde8251a8e34e87c54e3f93147d56c9e", 523776),
+			Common::FR_FRA,
+			Common::kPlatformDOS,
 			ADGF_CD,
 			GUIO0()
- 		},
- 		GID_RTZ,
- 		0,
- 		GF_CD,
- 		3,
- 	},
-
- 	{
- 		// Return to Zork - French CD version 1.2 5/13/95
+		},
+		GID_RTZ,
+		0,
+		GF_CD,
+		3,
+	},
+
+	{
+		// Return to Zork - French CD version 1.2 5/13/95
 		// Patch #2685032 submitted by goodoldgeorg
- 		{
- 			"rtz",
- 			"V1.2, 3/31/95, CD",
- 			AD_ENTRY1s("rtzcd.red", "946997d8b0aa6cb4e848bad02a1fc3d2", 354614),
- 			Common::FR_FRA,
- 			Common::kPlatformDOS,
+		{
+			"rtz",
+			"V1.2, 3/31/95, CD",
+			AD_ENTRY1s("rtzcd.red", "946997d8b0aa6cb4e848bad02a1fc3d2", 354614),
+			Common::FR_FRA,
+			Common::kPlatformDOS,
 			ADGF_CD,
 			GUIO0()
- 		},
- 		GID_RTZ,
- 		0,
- 		GF_CD_COMPRESSED,
- 		3,
- 	},
+		},
+		GID_RTZ,
+		0,
+		GF_CD_COMPRESSED,
+		3,
+	},
 
 	{
 		// Return to Zork - English floppy version
diff --git a/engines/made/screenfx.cpp b/engines/made/screenfx.cpp
index d069308..b89b3af 100644
--- a/engines/made/screenfx.cpp
+++ b/engines/made/screenfx.cpp
@@ -165,7 +165,7 @@ void ScreenEffects::flash(int flashCount, byte *palette, int colorCount) {
 		_screen->setRGBPalette(_fxPalette, 0, colorCount);
 		_screen->updateScreenAndWait(20);
 		_screen->setRGBPalette(palette, 0, colorCount);
- 		_screen->updateScreenAndWait(20);
+		_screen->updateScreenAndWait(20);
 	}
 }
 
diff --git a/engines/made/sound.cpp b/engines/made/sound.cpp
index f73c580..176f868 100644
--- a/engines/made/sound.cpp
+++ b/engines/made/sound.cpp
@@ -228,7 +228,7 @@ void decompressSound(byte *source, byte *dest, uint16 chunkSize, uint16 chunkCou
 			break;
 
 		default:
-	 		return;
+			return;
 
 		}
 


Commit: b3356464e49103ed2c579cf2dba56aaa32463995
    https://github.com/scummvm/scummvm/commit/b3356464e49103ed2c579cf2dba56aaa32463995
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-24T10:18:20-08:00

Commit Message:
AGOS: Janitorial - Fix spacing errors

Changed paths:
    engines/agos/icons.cpp



diff --git a/engines/agos/icons.cpp b/engines/agos/icons.cpp
index 6d4192d..5647fec 100644
--- a/engines/agos/icons.cpp
+++ b/engines/agos/icons.cpp
@@ -1089,15 +1089,15 @@ bool AGOSEngine_PN::ifObjectInInv(uint16 a) {
 }
 
 bool AGOSEngine_PN::testContainer(uint16 a) {
-	return 	bitextract(_quickptr[1] + a * _quickshort[1], 0) != 0;
+	return bitextract(_quickptr[1] + a * _quickshort[1], 0) != 0;
 }
 
 bool AGOSEngine_PN::testObvious(uint16 a) {
-	return 	bitextract(_quickptr[1] + a * _quickshort[1], 4) != 0;
+	return bitextract(_quickptr[1] + a * _quickshort[1], 4) != 0;
 }
 
 bool AGOSEngine_PN::testSeen(uint16 a) {
-	return 	bitextract(_quickptr[1] + a * _quickshort[1], 3) != 0;
+	return bitextract(_quickptr[1] + a * _quickshort[1], 3) != 0;
 }
 
 void AGOSEngine_PN::printIcon(HitArea *ha, uint8 i, uint8 r) {


Commit: 29a63886aa27d9cd3e9b01cdc896f83591b71c8b
    https://github.com/scummvm/scummvm/commit/29a63886aa27d9cd3e9b01cdc896f83591b71c8b
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-24T10:20:12-08:00

Commit Message:
TINSEL: Janitorial - Fix spacing errors

Changed paths:
    engines/tinsel/music.cpp



diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp
index 3144ea7..bf7257f 100644
--- a/engines/tinsel/music.cpp
+++ b/engines/tinsel/music.cpp
@@ -91,28 +91,29 @@ static const int enhancedAudioGRAVersion[] = {
 };
 
 static const int enhancedAudioSCNVersion[] = {
-	 301, 302,   2,    1,   1, 301, 302,   3,   3,   4,	//   1-10
-	   4,   5,   6,    1,   7,   8,   9,  10,   8,  11,	//  11-20
-	  11,  12,  13,   13,  13,  13,  13,  14,  13,  13,	//  21-30
-	  15,  16,  17,   15,  18,  19,  20, 338,  21,  21,	//  31-40
-	 341, 342,  22,   22,  23,  24,  25,  26,  27,  28,	//  41-50
-	  29,  30,  31,   32,  33,  34,  35,  35,  36,  37,	//  51-60
-	  38,  39,  39,   39,  39,  40,  39,  41,  41,  42,	//  61-70
-	  43,  42,  44,   45,  41,  46,  48,  47,  48,  49,	//  71-80
-	  50,  51,  52,   53,  54,  55,  56,  57,  58,  59,	//  81-90
-	  60,  61,  62,   63,  61,  64,  65,  66,  67,  68,	//  91-100
-	  69,  70,  68,   71,  72,  73,  74,  75,  12,  76,	// 101-110
-	  77,  78,  79,   80,   4,   4,  82,  83,  77,   4,	// 111-120
-	  84,  85,  86, 3124,  88,  89,  90,  88,   2,   2,	// 121-130
-	   2,   2,   2,    2,   2,   2,   2,   2,   2,   2,	// 131-140
-	3142,  91,  92,   93,  94,  94,  95,  96,  52,   4,	// 141-150
-	  97,  98,  99,   99                             	// 151-154
+	 301, 302,   2,    1,   1, 301, 302,   3,   3,   4, //   1-10
+	   4,   5,   6,    1,   7,   8,   9,  10,   8,  11, //  11-20
+	  11,  12,  13,   13,  13,  13,  13,  14,  13,  13, //  21-30
+	  15,  16,  17,   15,  18,  19,  20, 338,  21,  21, //  31-40
+	 341, 342,  22,   22,  23,  24,  25,  26,  27,  28, //  41-50
+	  29,  30,  31,   32,  33,  34,  35,  35,  36,  37, //  51-60
+	  38,  39,  39,   39,  39,  40,  39,  41,  41,  42, //  61-70
+	  43,  42,  44,   45,  41,  46,  48,  47,  48,  49, //  71-80
+	  50,  51,  52,   53,  54,  55,  56,  57,  58,  59, //  81-90
+	  60,  61,  62,   63,  61,  64,  65,  66,  67,  68, //  91-100
+	  69,  70,  68,   71,  72,  73,  74,  75,  12,  76, // 101-110
+	  77,  78,  79,   80,   4,   4,  82,  83,  77,   4, // 111-120
+	  84,  85,  86, 3124,  88,  89,  90,  88,   2,   2, // 121-130
+	   2,   2,   2,    2,   2,   2,   2,   2,   2,   2, // 131-140
+	3142,  91,  92,   93,  94,  94,  95,  96,  52,   4, // 141-150
+	  97,  98,  99,   99                                // 151-154
 };
 
 int GetTrackNumber(SCNHANDLE hMidi) {
-	for (int i = 0; i < ARRAYSIZE(g_midiOffsets); i++)
+	for (int i = 0; i < ARRAYSIZE(g_midiOffsets); i++) {
 		if (g_midiOffsets[i] == hMidi)
 			return i;
+	}
 
 	return -1;
 }


Commit: a8de5dfad87fe54b9f6cd12d0d70c37b2751939d
    https://github.com/scummvm/scummvm/commit/a8de5dfad87fe54b9f6cd12d0d70c37b2751939d
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-24T10:28:54-08:00

Commit Message:
LASTEXPRESS: Janitorial - Fix spacing errors

Changed paths:
    engines/lastexpress/entities/entity.h
    engines/lastexpress/entities/servers0.cpp
    engines/lastexpress/entities/verges.cpp
    engines/lastexpress/game/entities.h
    engines/lastexpress/game/logic.cpp
    engines/lastexpress/game/logic.h
    engines/lastexpress/game/object.cpp
    engines/lastexpress/game/savegame.h
    engines/lastexpress/game/state.h



diff --git a/engines/lastexpress/entities/entity.h b/engines/lastexpress/entities/entity.h
index 5aa7c1b..f3b57e7 100644
--- a/engines/lastexpress/entities/entity.h
+++ b/engines/lastexpress/entities/entity.h
@@ -818,9 +818,9 @@ public:
 		/**
 		 * Synchronizes a string.
 		 *
-		 * @param	s	  	The Common::Serializer to use.
-		 * @param	string	The string.
-		 * @param	length	Length of the string.
+		 * @param   s        The Common::Serializer to use.
+		 * @param   string   The string.
+		 * @param   length   Length of the string.
 		 */
 		void syncString(Common::Serializer &s, Common::String &string, uint length) const;
 
@@ -921,7 +921,7 @@ protected:
 	/**
 	 * Play sound
 	 *
-	 * @param savepoint The savepoint
+	 * @param savepoint   The savepoint
 	 *                    - Sound filename
 	 * @param resetItem true to reset item.
 	 * @param flag      sound flag
@@ -931,9 +931,9 @@ protected:
 	/**
 	 * Draws the entity
 	 *
-	 * @param savepoint 	 The savepoint
-	 *                         - Sequence
-	 *                         - ExcuseMe flag
+	 * @param savepoint   The savepoint
+	 *                    - Sequence
+	 *                    - ExcuseMe flag
 	 * @param handleExcuseMe true to handle excuseMeCath action
 	 */
 	void draw(const SavePoint &savepoint, bool handleExcuseMe = false);
@@ -941,7 +941,7 @@ protected:
 	/**
 	 * Draws the entity along with another one
 	 *
-	 * @param savepoint The savepoint.
+	 * @param savepoint   The savepoint.
 	 *                    - Sequence 1
 	 *                    - Sequence 2
 	 *                    - EntityIndex
@@ -976,23 +976,23 @@ protected:
 	/**
 	 * Process callback action when the entity direction is not kDirectionRight
 	 *
-	 * @param savepoint The savepoint.
+	 * @param savepoint    The savepoint.
 	 */
 	void callbackActionOnDirection(const SavePoint &savepoint);
 
 	/**
 	 * Process callback action when somebody is standing in the restaurant or salon.
 	 *
-	 * @param savepoint The savepoint.
+	 * @param savepoint    The savepoint.
 	 */
 	void callbackActionRestaurantOrSalon(const SavePoint &savepoint);
 
 	/**
 	 * Updates the entity
 	 *
-	 * @param savepoint 	 The savepoint.
-	 *                        - CarIndex
-	 *                        - EntityPosition
+	 * @param savepoint    The savepoint.
+	 *                     - CarIndex
+	 *                     - EntityPosition
 	 * @param handleExcuseMe true to handle the kActionExcuseMe/kActionExcuseMeCath actions.
 	 */
 	void updateEntity(const SavePoint &savepoint, bool handleExcuseMe = false);
@@ -1000,11 +1000,11 @@ protected:
 	/**
 	 * Call a specific savepoint (or draw sequence in default case)
 	 *
-	 * @param savepoint 	 The savepoint.
-	 *                         - Sequence to draw in default case
-	 *                         - EntityIndex
-	 *                         - ActionIndex
-	 *                         - Sequence for the savepoint
+	 * @param savepoint    The savepoint.
+	 *                     - Sequence to draw in default case
+	 *                     - EntityIndex
+	 *                     - ActionIndex
+	 *                     - Sequence for the savepoint
 	 * @param handleExcuseMe true to handle excuse me.
 	 */
 	void callSavepoint(const SavePoint &savepoint, bool handleExcuseMe = false);
@@ -1012,36 +1012,36 @@ protected:
 	/**
 	 * Handles entering/exiting a compartment.
 	 *
-	 * @param savepoint   The savepoint.
-	 * @param position1   The first position.
-	 * @param position2   The second position.
-	 * @param car 		  The car.
-	 * @param compartment The compartment.
-	 * @param alternate   true to use the alternate version of SceneManager::loadSceneFromObject()
+	 * @param savepoint    The savepoint.
+	 * @param position1    The first position.
+	 * @param position2    The second position.
+	 * @param car          The car.
+	 * @param compartment  The compartment.
+	 * @param alternate    true to use the alternate version of SceneManager::loadSceneFromObject()
 	 */
 	void enterExitCompartment(const SavePoint &savepoint, EntityPosition position1 = kPositionNone, EntityPosition position2 = kPositionNone, CarIndex car = kCarNone, ObjectIndex compartment = kObjectNone, bool alternate = false, bool updateLocation = false);
 
 	/**
 	 * Go to compartment.
 	 *
-	 * @param	savepoint			 	The savepoint.
-	 * @param	compartmentFrom		 	The compartment from.
-	 * @param	positionFrom		 	The position from.
-	 * @param	sequenceFrom		 	The sequence from.
-	 * @param	sequenceTo			 	The sequence to.
+	 * @param savepoint        The savepoint.
+	 * @param compartmentFrom  The compartment from.
+	 * @param positionFrom     The position from.
+	 * @param sequenceFrom     The sequence from.
+	 * @param sequenceTo       The sequence to.
 	 */
 	void goToCompartment(const SavePoint &savepoint, ObjectIndex compartmentFrom, EntityPosition positionFrom, Common::String sequenceFrom, Common::String sequenceTo);
 
 	/**
 	 * Go to compartment from compartment.
 	 *
-	 * @param	savepoint			  	The savepoint.
-	 * @param	compartmentFrom		  	The compartment from.
-	 * @param	positionFrom		  	The position from.
-	 * @param	sequenceFrom		  	The sequence from.
-	 * @param	compartmentTo		  	The compartment to.
-	 * @param	positionTo			  	The position to.
-	 * @param	sequenceTo			  	The sequence to.
+	 * @param savepoint        The savepoint.
+	 * @param compartmentFrom  The compartment from.
+	 * @param positionFrom     The position from.
+	 * @param sequenceFrom     The sequence from.
+	 * @param compartmentTo    The compartment to.
+	 * @param positionTo       The position to.
+	 * @param sequenceTo       The sequence to.
 	 */
 	void goToCompartmentFromCompartment(const SavePoint &savepoint, ObjectIndex compartmentFrom, EntityPosition positionFrom, Common::String sequenceFrom, ObjectIndex compartmentTo, EntityPosition positionTo, Common::String sequenceTo);
 
diff --git a/engines/lastexpress/entities/servers0.cpp b/engines/lastexpress/entities/servers0.cpp
index 73e0d34..6323ef0 100644
--- a/engines/lastexpress/entities/servers0.cpp
+++ b/engines/lastexpress/entities/servers0.cpp
@@ -115,7 +115,7 @@ IMPLEMENT_FUNCTION_NOSETUP(5, Servers0, callbackActionOnDirection)
 
 	case kActionExitCompartment:
 		callbackAction();
- 		break;
+		break;
 
 	case kActionExcuseMeCath:
 		if (!params->param1) {
@@ -445,7 +445,7 @@ IMPLEMENT_FUNCTION(24, Servers0, chapter2Handler)
 
 		HANDLE_TABLE(1, 3, 1, setup_function25);
 		HANDLE_TABLE(1, 4, 2, setup_function26);
- 		break;
+		break;
 
 	case kActionCallback:
 		if (getCallback() == 1)
diff --git a/engines/lastexpress/entities/verges.cpp b/engines/lastexpress/entities/verges.cpp
index d9ddb0a..68c0813 100644
--- a/engines/lastexpress/entities/verges.cpp
+++ b/engines/lastexpress/entities/verges.cpp
@@ -105,7 +105,7 @@ IMPLEMENT_FUNCTION(3, Verges, callbackActionOnDirection)
 
 	case kActionExitCompartment:
 		callbackAction();
- 		break;
+		break;
 
 	case kActionExcuseMeCath:
 		if (!params->param1) {
diff --git a/engines/lastexpress/game/entities.h b/engines/lastexpress/game/entities.h
index 81aed62..cacbc40 100644
--- a/engines/lastexpress/game/entities.h
+++ b/engines/lastexpress/game/entities.h
@@ -110,7 +110,7 @@ public:
 	 * Query if 'entity' is inside a compartment
 	 *
 	 * @param entity   The entity.
-	 * @param car 	   The car.
+	 * @param car      The car.
 	 * @param position The position.
 	 *
 	 * @return true if inside the compartment, false if not.
@@ -247,7 +247,7 @@ public:
 	/**
 	 * Query if nobody is in a compartment at that position.
 	 *
-	 * @param car 	   The car.
+	 * @param car      The car.
 	 * @param position The position.
 	 *
 	 * @return true if nobody is in a compartment, false if not.
@@ -334,8 +334,8 @@ private:
 	static const int _compartmentsCount = 16;
 	static const int _positionsCount = 100 * 10;  // 100 positions per train car
 
-	LastExpressEngine	    *_engine;
-	EntityData 			    *_header;
+	LastExpressEngine       *_engine;
+	EntityData              *_header;
 	Common::Array<Entity *>  _entities;
 
 	// Compartments & positions
diff --git a/engines/lastexpress/game/logic.cpp b/engines/lastexpress/game/logic.cpp
index 09104d1..d24fb9b 100644
--- a/engines/lastexpress/game/logic.cpp
+++ b/engines/lastexpress/game/logic.cpp
@@ -413,8 +413,8 @@ void Logic::resetState() {
 /**
  * Handle game over
  *
- * @param type 		 The savegame type.
- * @param value 	 The value (event, time, index, ...)
+ * @param type       The savegame type.
+ * @param value      The value (event, time, index, ...)
  * @param sceneIndex Index of the scene to show.
  * @param showScene  true to show a scene, false to return to menu directly
  */
diff --git a/engines/lastexpress/game/logic.h b/engines/lastexpress/game/logic.h
index efb8f1e..b2d08cb 100644
--- a/engines/lastexpress/game/logic.h
+++ b/engines/lastexpress/game/logic.h
@@ -54,7 +54,7 @@ public:
 	void playFinalSequence() const;
 	void updateCursor(bool redraw = true) const;
 
-	Action 	   *getGameAction()   { return _action; }
+	Action     *getGameAction()   { return _action; }
 	Beetle     *getGameBeetle()   { return _beetle; }
 	Entities   *getGameEntities() { return _entities; }
 	Fight      *getGameFight()    { return _fight; }
diff --git a/engines/lastexpress/game/object.cpp b/engines/lastexpress/game/object.cpp
index 48df91e..2fcdde1 100644
--- a/engines/lastexpress/game/object.cpp
+++ b/engines/lastexpress/game/object.cpp
@@ -69,11 +69,12 @@ void Objects::update(ObjectIndex index, EntityIndex entity, ObjectLocation locat
 	getFlags()->flag_3 = true;
 
 	// Compartments
-	if (original_location != location && (original_location == kObjectLocation2 || location == kObjectLocation2))
+	if (original_location != location && (original_location == kObjectLocation2 || location == kObjectLocation2)) {
 		if ((index >= kObjectCompartment1 && index <= kObjectCompartment8)
-	     || (index >= kObjectCompartmentA && index <= kObjectCompartmentF)) {
-		 	getScenes()->updateDoorsAndClock();
+		   || (index >= kObjectCompartmentA && index <= kObjectCompartmentF)) {
+			getScenes()->updateDoorsAndClock();
 		}
+	}
 }
 
 void Objects::updateLocation2(ObjectIndex index, ObjectLocation location2) {
diff --git a/engines/lastexpress/game/savegame.h b/engines/lastexpress/game/savegame.h
index 3619572..257c005 100644
--- a/engines/lastexpress/game/savegame.h
+++ b/engines/lastexpress/game/savegame.h
@@ -167,7 +167,7 @@ public:
 	bool isGameFinished(uint32 menuIndex, uint32 savegameIndex);
 
 	// Accessors
- 	uint32       getTime(uint32 index) { return getEntry(index)->time; }
+	uint32       getTime(uint32 index) { return getEntry(index)->time; }
 	ChapterIndex getChapter(uint32 index) { return getEntry(index)->chapter; }
 	uint32       getValue(uint32 index) { return getEntry(index)->value; }
 	uint32       getLastSavegameTicks() const { return _gameTicksLastSavegame; }
diff --git a/engines/lastexpress/game/state.h b/engines/lastexpress/game/state.h
index 944f6d4..83d528d 100644
--- a/engines/lastexpress/game/state.h
+++ b/engines/lastexpress/game/state.h
@@ -657,12 +657,12 @@ private:
 	// Timer
 	int _timer;
 
-	Flags *_flags;				///< Flags
-	Inventory *_inventory;  	///< Inventory
-	Objects *_objects;			///< Objects
-	SavePoints *_savepoints;	///< SavePoints
-	GameState *_state;			///< State
-	Common::Point _coords;		///< Current coordinates
+	Flags *_flags;           ///< Flags
+	Inventory *_inventory;   ///< Inventory
+	Objects *_objects;       ///< Objects
+	SavePoints *_savepoints; ///< SavePoints
+	GameState *_state;       ///< State
+	Common::Point _coords;   ///< Current coordinates
 };
 
 } // End of namespace LastExpress






More information about the Scummvm-git-logs mailing list