From ef11f9d0c53cbdd9d88a99143de6f43f34d7e24d Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Thu, 26 Jul 2012 15:59:26 +0200
Subject: WINTERMUTE: Run Astyle with add-braces to break one-line statements
 into easier-to-read-code.

---
 engines/wintermute/base/base_fader.cpp | 45 ++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 13 deletions(-)

(limited to 'engines/wintermute/base/base_fader.cpp')

diff --git a/engines/wintermute/base/base_fader.cpp b/engines/wintermute/base/base_fader.cpp
index 10818abfb9..04fde5457c 100644
--- a/engines/wintermute/base/base_fader.cpp
+++ b/engines/wintermute/base/base_fader.cpp
@@ -59,23 +59,31 @@ BaseFader::~BaseFader() {
 
 //////////////////////////////////////////////////////////////////////////
 bool BaseFader::update() {
-	if (!_active) return STATUS_OK;
+	if (!_active) {
+		return STATUS_OK;
+	}
 
 	int alphaDelta = _targetAlpha - _sourceAlpha;
 
 	uint32 time;
 
-	if (_system) time = g_system->getMillis() - _startTime;
-	else time = _gameRef->_timer - _startTime;
+	if (_system) {
+		time = g_system->getMillis() - _startTime;
+	} else {
+		time = _gameRef->_timer - _startTime;
+	}
 
-	if (time >= _duration) _currentAlpha = _targetAlpha;
-	else {
+	if (time >= _duration) {
+		_currentAlpha = _targetAlpha;
+	} else {
 		_currentAlpha = (byte)(_sourceAlpha + (float)time / (float)_duration * alphaDelta);
 	}
 	_currentAlpha = MIN((unsigned char)255, MAX(_currentAlpha, (byte)0));  // TODO: clean
 
 	_ready = time >= _duration;
-	if (_ready && _currentAlpha == 0x00) _active = false;
+	if (_ready && _currentAlpha == 0x00) {
+		_active = false;
+	}
 
 	return STATUS_OK;
 }
@@ -83,10 +91,13 @@ bool BaseFader::update() {
 
 //////////////////////////////////////////////////////////////////////////
 bool BaseFader::display() {
-	if (!_active) return STATUS_OK;
+	if (!_active) {
+		return STATUS_OK;
+	}
 
-	if (_currentAlpha > 0x00)
+	if (_currentAlpha > 0x00) {
 		_gameRef->_renderer->fadeToColor(_red, _green, _blue, _currentAlpha);
+	}
 	return STATUS_OK;
 }
 
@@ -114,8 +125,11 @@ bool BaseFader::fadeIn(uint32 sourceColor, uint32 duration, bool system) {
 	_duration = duration;
 	_system = system;
 
-	if (_system) _startTime = g_system->getMillis();
-	else _startTime = _gameRef->_timer;
+	if (_system) {
+		_startTime = g_system->getMillis();
+	} else {
+		_startTime = _gameRef->_timer;
+	}
 
 	return STATUS_OK;
 }
@@ -137,8 +151,11 @@ bool BaseFader::fadeOut(uint32 targetColor, uint32 duration, bool system) {
 	_duration = duration;
 	_system = system;
 
-	if (_system) _startTime = g_system->getMillis();
-	else _startTime = _gameRef->_timer;
+	if (_system) {
+		_startTime = g_system->getMillis();
+	} else {
+		_startTime = _gameRef->_timer;
+	}
 
 
 	return STATUS_OK;
@@ -167,7 +184,9 @@ bool BaseFader::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transfer(TMEMBER(_targetAlpha));
 	persistMgr->transfer(TMEMBER(_system));
 
-	if (_system && !persistMgr->getIsSaving()) _startTime = 0;
+	if (_system && !persistMgr->getIsSaving()) {
+		_startTime = 0;
+	}
 
 	return STATUS_OK;
 }
-- 
cgit v1.2.3