[Scummvm-cvs-logs] scummvm master -> 1581ed2edb5f0f991bf43e0b7781bb51dc395b86

[urukgit]

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:
1581ed2edb AVALANCHE: Remove unnecessary whitespaces.


Commit: 1581ed2edb5f0f991bf43e0b7781bb51dc395b86
    https://github.com/scummvm/scummvm/commit/1581ed2edb5f0f991bf43e0b7781bb51dc395b86
Author: urukgit (koppirnyo at gmail.com)
Date: 2013-11-05T12:50:41-08:00

Commit Message:
AVALANCHE: Remove unnecessary whitespaces.

Changed paths:
    engines/avalanche/avalanche.cpp
    engines/avalanche/avalanche.h
    engines/avalanche/avalot.cpp
    engines/avalanche/parser.cpp



diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index 53a7583..f500078 100644
--- a/engines/avalanche/avalanche.cpp
+++ b/engines/avalanche/avalanche.cpp
@@ -358,7 +358,7 @@ bool AvalancheEngine::saveGame(const int16 slot, const Common::String &desc) {
 	f->writeSint16LE(t.tm_mon);
 	f->writeSint16LE(t.tm_year);
     
-    _totalTime += getTimeInSeconds() - _startTime;
+	_totalTime += getTimeInSeconds() - _startTime;
 
 	Common::Serializer sz(NULL, f);
 	synchronize(sz);
@@ -422,7 +422,7 @@ bool AvalancheEngine::loadGame(const int16 slot) {
 	delete f;
 
 	_isLoaded = true;
-    _ableToAddTimer = false;
+	_ableToAddTimer = false;
 	_seeScroll = true;  // This prevents display of the new sprites before the new picture is loaded.
 
 	if (_holdTheDawn) {
diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h
index 9c0fb34..909e8ff 100644
--- a/engines/avalanche/avalanche.h
+++ b/engines/avalanche/avalanche.h
@@ -111,7 +111,7 @@ public:
 	Common::Error loadGameState(int slot);
 	bool loadGame(const int16 slot);
 	Common::String expandDate(int d, int m, int y);
-    uint32 getTimeInSeconds();
+	uint32 getTimeInSeconds();
 
 	void updateEvents();
 	bool getEvent(Common::Event &event); // A wrapper around _eventMan->pollEvent(), so we can use it in Scrolls::normscroll() for example.
@@ -211,8 +211,8 @@ public:
 	bool _takenPen; // Have you taken the pen (in Cardiff?)
 	bool _arrowInTheDoor;  // Did the arrow hit the wall?
 	Common::String _favoriteDrink, _favoriteSong, _worstPlaceOnEarth, _spareEvening; // Personalisation str's
-    uint32 _startTime; // When did you start playing this session?
-    uint32 _totalTime; // Your total time playing this game, in seconds. Updated only at saving and loading.
+	uint32 _startTime; // When did you start playing this session?
+	uint32 _totalTime; // Your total time playing this game, in seconds. Updated only at saving and loading.
 	byte _jumpStatus; // Fixes how high you're jumping.
 	bool _mushroomGrowing; // Is the mushroom growing in 42?
 	bool _crapulusWillTell; // Will Crapulus tell you about Spludwick being away?
@@ -264,10 +264,10 @@ public:
 	bool _doingSpriteRun; // Only set to True if we're doing a sprite_run at this moment. This stops the trippancy system from moving any of the sprites.
 	bool _soundFx;
 
-    // These two have very similar purpose, but it's crucial not to modify _isLoaded later than the actual loading
-    // or at the begginning of the game, and _ablteToAddTimer must be modified in addTimer().
-    bool _isLoaded; // Is it a loaded gamestate?
-    bool _ableToAddTimer;
+	// These two have very similar purpose, but it's crucial not to modify _isLoaded later than the actual loading
+	// or at the begginning of the game, and _ablteToAddTimer must be modified in addTimer().
+	bool _isLoaded; // Is it a loaded gamestate?
+	bool _ableToAddTimer;
     
 	void callVerb(VerbCode id);
 	void loadRoom(byte num);
diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index 2a11a92..db987b6 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -1479,7 +1479,7 @@ void AvalancheEngine::resetVariables() {
 	_takenMushroom = false;
 	_givenPenToAyles = false;
 	_askedDogfoodAboutNim = false;
-    _startTime = getTimeInSeconds();
+	_startTime = getTimeInSeconds();
 
 	_parser->resetVariables();
 	_animation->resetVariables();
@@ -1530,8 +1530,8 @@ void AvalancheEngine::newGame() {
 	_doingSpriteRun = false;
 	_avvyInBed = true;
     
-    _ableToAddTimer = true; // Set to false in _vm->loadGame().
-    _isLoaded = false;
+	_ableToAddTimer = true; // Set to false in _vm->loadGame().
+	_isLoaded = false;
 
 	enterRoom(kRoomYours, 1);
 	avvy->_visible = false;
diff --git a/engines/avalanche/parser.cpp b/engines/avalanche/parser.cpp
index d71e08f..1b6bc78 100644
--- a/engines/avalanche/parser.cpp
+++ b/engines/avalanche/parser.cpp
@@ -604,11 +604,11 @@ Common::String Parser::totalTime() {
 	uint16 h, m, s;
 
 	uint32 curTime = _vm->getTimeInSeconds() - _vm->_startTime;
-    if (_vm->_isLoaded)
-        curTime += _vm->_totalTime;
+	if (_vm->_isLoaded)
+    	curTime += _vm->_totalTime;
     
-    h = (uint16)(curTime / 3600);
-    s = (uint16)(curTime  % 3600);
+	h = (uint16)(curTime / 3600);
+	s = (uint16)(curTime  % 3600);
 	m = s / 60;
 	s = s % 60;