From 5683f076331d2831eb4720b65bb53e8d01ca33ee Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Sat, 21 Jul 2012 18:19:07 +0200
Subject: WINTERMUTE: Rename CamelCased filenames to
 prefixed_under_score-filenames

This is mostly a lead-up to namespacing the Ad/Base folders, and then
possibly removing the prefixes from the files, it also has the added
benefit of getting rid of the odd case-typos that makes for issues
on platforms that don't ignore case.
---
 engines/wintermute/base/base_fader.cpp | 176 +++++++++++++++++++++++++++++++++
 1 file changed, 176 insertions(+)
 create mode 100644 engines/wintermute/base/base_fader.cpp

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

diff --git a/engines/wintermute/base/base_fader.cpp b/engines/wintermute/base/base_fader.cpp
new file mode 100644
index 0000000000..712f64eb6f
--- /dev/null
+++ b/engines/wintermute/base/base_fader.cpp
@@ -0,0 +1,176 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+/*
+ * This file is based on WME Lite.
+ * http://dead-code.org/redir.php?target=wmelite
+ * Copyright (c) 2011 Jan Nedoma
+ */
+
+#include "engines/wintermute/dcgf.h"
+#include "engines/wintermute/base/base_Fader.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/platform_osystem.h"
+#include "common/util.h"
+
+namespace WinterMute {
+
+//////////////////////////////////////////////////////////////////////
+// Construction/Destruction
+//////////////////////////////////////////////////////////////////////
+
+IMPLEMENT_PERSISTENT(CBFader, false)
+
+//////////////////////////////////////////////////////////////////////////
+CBFader::CBFader(CBGame *inGame): CBObject(inGame) {
+	_active = false;
+	_red = _green = _blue = 0;
+	_currentAlpha = 0x00;
+	_sourceAlpha = 0;
+	_targetAlpha = 0;
+	_duration = 1000;
+	_startTime = 0;
+	_system = false;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+CBFader::~CBFader() {
+
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool CBFader::update() {
+	if (!_active) return STATUS_OK;
+
+	int alphaDelta = _targetAlpha - _sourceAlpha;
+
+	uint32 time;
+
+	if (_system) time = CBPlatform::getTime() - _startTime;
+	else time = _gameRef->_timer - _startTime;
+
+	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;
+
+	return STATUS_OK;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool CBFader::display() {
+	if (!_active) return STATUS_OK;
+
+	if (_currentAlpha > 0x00) return _gameRef->_renderer->fadeToColor(BYTETORGBA(_red, _green, _blue, _currentAlpha));
+	else return STATUS_OK;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool CBFader::deactivate() {
+	_active = false;
+	_ready = true;
+	return STATUS_OK;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool CBFader::fadeIn(uint32 sourceColor, uint32 duration, bool system) {
+	_ready = false;
+	_active = true;
+
+	_red   = RGBCOLGetR(sourceColor);
+	_green = RGBCOLGetG(sourceColor);
+	_blue  = RGBCOLGetB(sourceColor);
+
+	_sourceAlpha = RGBCOLGetA(sourceColor);
+	_targetAlpha = 0;
+
+	_duration = duration;
+	_system = system;
+
+	if (_system) _startTime = CBPlatform::getTime();
+	else _startTime = _gameRef->_timer;
+
+	return STATUS_OK;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool CBFader::fadeOut(uint32 targetColor, uint32 duration, bool system) {
+	_ready = false;
+	_active = true;
+
+	_red   = RGBCOLGetR(targetColor);
+	_green = RGBCOLGetG(targetColor);
+	_blue  = RGBCOLGetB(targetColor);
+
+	//_sourceAlpha = 0;
+	_sourceAlpha = _currentAlpha;
+	_targetAlpha = RGBCOLGetA(targetColor);
+
+	_duration = duration;
+	_system = system;
+
+	if (_system) _startTime = CBPlatform::getTime();
+	else _startTime = _gameRef->_timer;
+
+
+	return STATUS_OK;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+uint32 CBFader::getCurrentColor() {
+	return BYTETORGBA(_red, _green, _blue, _currentAlpha);
+}
+
+
+
+//////////////////////////////////////////////////////////////////////////
+bool CBFader::persist(CBPersistMgr *persistMgr) {
+	CBObject::persist(persistMgr);
+
+	persistMgr->transfer(TMEMBER(_active));
+	persistMgr->transfer(TMEMBER(_blue));
+	persistMgr->transfer(TMEMBER(_currentAlpha));
+	persistMgr->transfer(TMEMBER(_duration));
+	persistMgr->transfer(TMEMBER(_green));
+	persistMgr->transfer(TMEMBER(_red));
+	persistMgr->transfer(TMEMBER(_sourceAlpha));
+	persistMgr->transfer(TMEMBER(_startTime));
+	persistMgr->transfer(TMEMBER(_targetAlpha));
+	persistMgr->transfer(TMEMBER(_system));
+
+	if (_system && !persistMgr->_saving) _startTime = 0;
+
+	return STATUS_OK;
+}
+
+} // end of namespace WinterMute
-- 
cgit v1.2.3


From 6e780b04dccdff3f09a760d4bc492a896418f486 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Sat, 21 Jul 2012 19:37:05 +0200
Subject: WINTERMUTE: Fix a few Upper_case filenames that got missed in the
 last commit.

---
 engines/wintermute/base/base_fader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 712f64eb6f..b34e89e41a 100644
--- a/engines/wintermute/base/base_fader.cpp
+++ b/engines/wintermute/base/base_fader.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/base_Fader.h"
+#include "engines/wintermute/base/base_fader.h"
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/platform_osystem.h"
 #include "common/util.h"
-- 
cgit v1.2.3


From b5a07fef8ebf29f7f44b15d9b34799c7e115fdad Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Sat, 21 Jul 2012 21:01:47 +0200
Subject: WINTERMUTE: Get rid of the C-prefix for class-definitions.

---
 engines/wintermute/base/base_fader.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 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 b34e89e41a..4dcdf82347 100644
--- a/engines/wintermute/base/base_fader.cpp
+++ b/engines/wintermute/base/base_fader.cpp
@@ -38,10 +38,10 @@ namespace WinterMute {
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
 
-IMPLEMENT_PERSISTENT(CBFader, false)
+IMPLEMENT_PERSISTENT(BaseFader, false)
 
 //////////////////////////////////////////////////////////////////////////
-CBFader::CBFader(CBGame *inGame): CBObject(inGame) {
+BaseFader::BaseFader(BaseGame *inGame): BaseObject(inGame) {
 	_active = false;
 	_red = _green = _blue = 0;
 	_currentAlpha = 0x00;
@@ -54,20 +54,20 @@ CBFader::CBFader(CBGame *inGame): CBObject(inGame) {
 
 
 //////////////////////////////////////////////////////////////////////////
-CBFader::~CBFader() {
+BaseFader::~BaseFader() {
 
 }
 
 
 //////////////////////////////////////////////////////////////////////////
-bool CBFader::update() {
+bool BaseFader::update() {
 	if (!_active) return STATUS_OK;
 
 	int alphaDelta = _targetAlpha - _sourceAlpha;
 
 	uint32 time;
 
-	if (_system) time = CBPlatform::getTime() - _startTime;
+	if (_system) time = BasePlatform::getTime() - _startTime;
 	else time = _gameRef->_timer - _startTime;
 
 	if (time >= _duration) _currentAlpha = _targetAlpha;
@@ -84,7 +84,7 @@ bool CBFader::update() {
 
 
 //////////////////////////////////////////////////////////////////////////
-bool CBFader::display() {
+bool BaseFader::display() {
 	if (!_active) return STATUS_OK;
 
 	if (_currentAlpha > 0x00) return _gameRef->_renderer->fadeToColor(BYTETORGBA(_red, _green, _blue, _currentAlpha));
@@ -93,7 +93,7 @@ bool CBFader::display() {
 
 
 //////////////////////////////////////////////////////////////////////////
-bool CBFader::deactivate() {
+bool BaseFader::deactivate() {
 	_active = false;
 	_ready = true;
 	return STATUS_OK;
@@ -101,7 +101,7 @@ bool CBFader::deactivate() {
 
 
 //////////////////////////////////////////////////////////////////////////
-bool CBFader::fadeIn(uint32 sourceColor, uint32 duration, bool system) {
+bool BaseFader::fadeIn(uint32 sourceColor, uint32 duration, bool system) {
 	_ready = false;
 	_active = true;
 
@@ -115,7 +115,7 @@ bool CBFader::fadeIn(uint32 sourceColor, uint32 duration, bool system) {
 	_duration = duration;
 	_system = system;
 
-	if (_system) _startTime = CBPlatform::getTime();
+	if (_system) _startTime = BasePlatform::getTime();
 	else _startTime = _gameRef->_timer;
 
 	return STATUS_OK;
@@ -123,7 +123,7 @@ bool CBFader::fadeIn(uint32 sourceColor, uint32 duration, bool system) {
 
 
 //////////////////////////////////////////////////////////////////////////
-bool CBFader::fadeOut(uint32 targetColor, uint32 duration, bool system) {
+bool BaseFader::fadeOut(uint32 targetColor, uint32 duration, bool system) {
 	_ready = false;
 	_active = true;
 
@@ -138,7 +138,7 @@ bool CBFader::fadeOut(uint32 targetColor, uint32 duration, bool system) {
 	_duration = duration;
 	_system = system;
 
-	if (_system) _startTime = CBPlatform::getTime();
+	if (_system) _startTime = BasePlatform::getTime();
 	else _startTime = _gameRef->_timer;
 
 
@@ -147,15 +147,15 @@ bool CBFader::fadeOut(uint32 targetColor, uint32 duration, bool system) {
 
 
 //////////////////////////////////////////////////////////////////////////
-uint32 CBFader::getCurrentColor() {
+uint32 BaseFader::getCurrentColor() {
 	return BYTETORGBA(_red, _green, _blue, _currentAlpha);
 }
 
 
 
 //////////////////////////////////////////////////////////////////////////
-bool CBFader::persist(CBPersistMgr *persistMgr) {
-	CBObject::persist(persistMgr);
+bool BaseFader::persist(BasePersistenceManager *persistMgr) {
+	BaseObject::persist(persistMgr);
 
 	persistMgr->transfer(TMEMBER(_active));
 	persistMgr->transfer(TMEMBER(_blue));
-- 
cgit v1.2.3


From 448911930d8d6bf43a67769d50ee4048f296b7f4 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Mon, 23 Jul 2012 03:01:05 +0200
Subject: WINTERMUTE: Remove unused code from platform_osystem.h

---
 engines/wintermute/base/base_fader.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 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 4dcdf82347..c5f170bb43 100644
--- a/engines/wintermute/base/base_fader.cpp
+++ b/engines/wintermute/base/base_fader.cpp
@@ -29,7 +29,6 @@
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/base/base_fader.h"
 #include "engines/wintermute/base/base_game.h"
-#include "engines/wintermute/platform_osystem.h"
 #include "common/util.h"
 
 namespace WinterMute {
@@ -67,7 +66,7 @@ bool BaseFader::update() {
 
 	uint32 time;
 
-	if (_system) time = BasePlatform::getTime() - _startTime;
+	if (_system) time = g_system->getMillis() - _startTime;
 	else time = _gameRef->_timer - _startTime;
 
 	if (time >= _duration) _currentAlpha = _targetAlpha;
@@ -115,7 +114,7 @@ bool BaseFader::fadeIn(uint32 sourceColor, uint32 duration, bool system) {
 	_duration = duration;
 	_system = system;
 
-	if (_system) _startTime = BasePlatform::getTime();
+	if (_system) _startTime = g_system->getMillis();
 	else _startTime = _gameRef->_timer;
 
 	return STATUS_OK;
@@ -138,7 +137,7 @@ bool BaseFader::fadeOut(uint32 targetColor, uint32 duration, bool system) {
 	_duration = duration;
 	_system = system;
 
-	if (_system) _startTime = BasePlatform::getTime();
+	if (_system) _startTime = g_system->getMillis();
 	else _startTime = _gameRef->_timer;
 
 
-- 
cgit v1.2.3


From aedb0aea505e764c4c7bab1f90520b380be4d688 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Mon, 23 Jul 2012 03:22:49 +0200
Subject: WINTERMUTE: Remove dcgf.h from almost all includes.

---
 engines/wintermute/base/base_fader.cpp | 1 -
 1 file changed, 1 deletion(-)

(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 c5f170bb43..8ed2fb3f0b 100644
--- a/engines/wintermute/base/base_fader.cpp
+++ b/engines/wintermute/base/base_fader.cpp
@@ -26,7 +26,6 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/base/base_fader.h"
 #include "engines/wintermute/base/base_game.h"
 #include "common/util.h"
-- 
cgit v1.2.3


From c7eda9abc80d1912148cae4292b94620c67a9c19 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Mon, 23 Jul 2012 03:42:27 +0200
Subject: WINTERMUTE: Encapsulate and distance BasePersistenceManager from
 Base.

---
 engines/wintermute/base/base_fader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 8ed2fb3f0b..4e7c608482 100644
--- a/engines/wintermute/base/base_fader.cpp
+++ b/engines/wintermute/base/base_fader.cpp
@@ -166,7 +166,7 @@ bool BaseFader::persist(BasePersistenceManager *persistMgr) {
 	persistMgr->transfer(TMEMBER(_targetAlpha));
 	persistMgr->transfer(TMEMBER(_system));
 
-	if (_system && !persistMgr->_saving) _startTime = 0;
+	if (_system && !persistMgr->getIsSaving()) _startTime = 0;
 
 	return STATUS_OK;
 }
-- 
cgit v1.2.3


From 6e55e32a381d1219dfbe8d3c1532d55b28291192 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Wed, 25 Jul 2012 20:00:58 +0200
Subject: WINTERMUTE: Cleanup and comment BaseRenderer a bit

---
 engines/wintermute/base/base_fader.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 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 4e7c608482..10818abfb9 100644
--- a/engines/wintermute/base/base_fader.cpp
+++ b/engines/wintermute/base/base_fader.cpp
@@ -85,8 +85,9 @@ bool BaseFader::update() {
 bool BaseFader::display() {
 	if (!_active) return STATUS_OK;
 
-	if (_currentAlpha > 0x00) return _gameRef->_renderer->fadeToColor(BYTETORGBA(_red, _green, _blue, _currentAlpha));
-	else return STATUS_OK;
+	if (_currentAlpha > 0x00)
+		_gameRef->_renderer->fadeToColor(_red, _green, _blue, _currentAlpha);
+	return STATUS_OK;
 }
 
 
-- 
cgit v1.2.3


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


From 8ed71a99f6aaee27a3187cb47fe0c3b30acf88a0 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Fri, 27 Jul 2012 19:37:00 +0200
Subject: WINTERMUTE: Constructor(args): SuperClass(args) -> Constructor(args)
 : SuperClass(args)

---
 engines/wintermute/base/base_fader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 04fde5457c..4bc166f841 100644
--- a/engines/wintermute/base/base_fader.cpp
+++ b/engines/wintermute/base/base_fader.cpp
@@ -39,7 +39,7 @@ namespace WinterMute {
 IMPLEMENT_PERSISTENT(BaseFader, false)
 
 //////////////////////////////////////////////////////////////////////////
-BaseFader::BaseFader(BaseGame *inGame): BaseObject(inGame) {
+BaseFader::BaseFader(BaseGame *inGame) : BaseObject(inGame) {
 	_active = false;
 	_red = _green = _blue = 0;
 	_currentAlpha = 0x00;
-- 
cgit v1.2.3


From fed19cb66ae5b56dd7dc81b90edd5a0d15986678 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Mon, 13 Aug 2012 03:42:30 +0200
Subject: WINTERMUTE: WinterMute -> Wintermute

---
 engines/wintermute/base/base_fader.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 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 4bc166f841..580a7afeb4 100644
--- a/engines/wintermute/base/base_fader.cpp
+++ b/engines/wintermute/base/base_fader.cpp
@@ -30,7 +30,7 @@
 #include "engines/wintermute/base/base_game.h"
 #include "common/util.h"
 
-namespace WinterMute {
+namespace Wintermute {
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
@@ -191,4 +191,4 @@ bool BaseFader::persist(BasePersistenceManager *persistMgr) {
 	return STATUS_OK;
 }
 
-} // end of namespace WinterMute
+} // end of namespace Wintermute
-- 
cgit v1.2.3


From b4090ead4d4334e08725323ff72fd355c93b63d5 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 4 Sep 2012 22:17:23 +0200
Subject: WINTERMUTE: Convert CRLF to LF

---
 engines/wintermute/base/base_fader.cpp | 388 ++++++++++++++++-----------------
 1 file changed, 194 insertions(+), 194 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 580a7afeb4..08e6f689ba 100644
--- a/engines/wintermute/base/base_fader.cpp
+++ b/engines/wintermute/base/base_fader.cpp
@@ -1,194 +1,194 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-/*
- * This file is based on WME Lite.
- * http://dead-code.org/redir.php?target=wmelite
- * Copyright (c) 2011 Jan Nedoma
- */
-
-#include "engines/wintermute/base/base_fader.h"
-#include "engines/wintermute/base/base_game.h"
-#include "common/util.h"
-
-namespace Wintermute {
-
-//////////////////////////////////////////////////////////////////////
-// Construction/Destruction
-//////////////////////////////////////////////////////////////////////
-
-IMPLEMENT_PERSISTENT(BaseFader, false)
-
-//////////////////////////////////////////////////////////////////////////
-BaseFader::BaseFader(BaseGame *inGame) : BaseObject(inGame) {
-	_active = false;
-	_red = _green = _blue = 0;
-	_currentAlpha = 0x00;
-	_sourceAlpha = 0;
-	_targetAlpha = 0;
-	_duration = 1000;
-	_startTime = 0;
-	_system = false;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-BaseFader::~BaseFader() {
-
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool BaseFader::update() {
-	if (!_active) {
-		return STATUS_OK;
-	}
-
-	int alphaDelta = _targetAlpha - _sourceAlpha;
-
-	uint32 time;
-
-	if (_system) {
-		time = g_system->getMillis() - _startTime;
-	} else {
-		time = _gameRef->_timer - _startTime;
-	}
-
-	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;
-	}
-
-	return STATUS_OK;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool BaseFader::display() {
-	if (!_active) {
-		return STATUS_OK;
-	}
-
-	if (_currentAlpha > 0x00) {
-		_gameRef->_renderer->fadeToColor(_red, _green, _blue, _currentAlpha);
-	}
-	return STATUS_OK;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool BaseFader::deactivate() {
-	_active = false;
-	_ready = true;
-	return STATUS_OK;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool BaseFader::fadeIn(uint32 sourceColor, uint32 duration, bool system) {
-	_ready = false;
-	_active = true;
-
-	_red   = RGBCOLGetR(sourceColor);
-	_green = RGBCOLGetG(sourceColor);
-	_blue  = RGBCOLGetB(sourceColor);
-
-	_sourceAlpha = RGBCOLGetA(sourceColor);
-	_targetAlpha = 0;
-
-	_duration = duration;
-	_system = system;
-
-	if (_system) {
-		_startTime = g_system->getMillis();
-	} else {
-		_startTime = _gameRef->_timer;
-	}
-
-	return STATUS_OK;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-bool BaseFader::fadeOut(uint32 targetColor, uint32 duration, bool system) {
-	_ready = false;
-	_active = true;
-
-	_red   = RGBCOLGetR(targetColor);
-	_green = RGBCOLGetG(targetColor);
-	_blue  = RGBCOLGetB(targetColor);
-
-	//_sourceAlpha = 0;
-	_sourceAlpha = _currentAlpha;
-	_targetAlpha = RGBCOLGetA(targetColor);
-
-	_duration = duration;
-	_system = system;
-
-	if (_system) {
-		_startTime = g_system->getMillis();
-	} else {
-		_startTime = _gameRef->_timer;
-	}
-
-
-	return STATUS_OK;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-uint32 BaseFader::getCurrentColor() {
-	return BYTETORGBA(_red, _green, _blue, _currentAlpha);
-}
-
-
-
-//////////////////////////////////////////////////////////////////////////
-bool BaseFader::persist(BasePersistenceManager *persistMgr) {
-	BaseObject::persist(persistMgr);
-
-	persistMgr->transfer(TMEMBER(_active));
-	persistMgr->transfer(TMEMBER(_blue));
-	persistMgr->transfer(TMEMBER(_currentAlpha));
-	persistMgr->transfer(TMEMBER(_duration));
-	persistMgr->transfer(TMEMBER(_green));
-	persistMgr->transfer(TMEMBER(_red));
-	persistMgr->transfer(TMEMBER(_sourceAlpha));
-	persistMgr->transfer(TMEMBER(_startTime));
-	persistMgr->transfer(TMEMBER(_targetAlpha));
-	persistMgr->transfer(TMEMBER(_system));
-
-	if (_system && !persistMgr->getIsSaving()) {
-		_startTime = 0;
-	}
-
-	return STATUS_OK;
-}
-
-} // end of namespace Wintermute
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+/*
+ * This file is based on WME Lite.
+ * http://dead-code.org/redir.php?target=wmelite
+ * Copyright (c) 2011 Jan Nedoma
+ */
+
+#include "engines/wintermute/base/base_fader.h"
+#include "engines/wintermute/base/base_game.h"
+#include "common/util.h"
+
+namespace Wintermute {
+
+//////////////////////////////////////////////////////////////////////
+// Construction/Destruction
+//////////////////////////////////////////////////////////////////////
+
+IMPLEMENT_PERSISTENT(BaseFader, false)
+
+//////////////////////////////////////////////////////////////////////////
+BaseFader::BaseFader(BaseGame *inGame) : BaseObject(inGame) {
+	_active = false;
+	_red = _green = _blue = 0;
+	_currentAlpha = 0x00;
+	_sourceAlpha = 0;
+	_targetAlpha = 0;
+	_duration = 1000;
+	_startTime = 0;
+	_system = false;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+BaseFader::~BaseFader() {
+
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool BaseFader::update() {
+	if (!_active) {
+		return STATUS_OK;
+	}
+
+	int alphaDelta = _targetAlpha - _sourceAlpha;
+
+	uint32 time;
+
+	if (_system) {
+		time = g_system->getMillis() - _startTime;
+	} else {
+		time = _gameRef->_timer - _startTime;
+	}
+
+	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;
+	}
+
+	return STATUS_OK;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool BaseFader::display() {
+	if (!_active) {
+		return STATUS_OK;
+	}
+
+	if (_currentAlpha > 0x00) {
+		_gameRef->_renderer->fadeToColor(_red, _green, _blue, _currentAlpha);
+	}
+	return STATUS_OK;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool BaseFader::deactivate() {
+	_active = false;
+	_ready = true;
+	return STATUS_OK;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool BaseFader::fadeIn(uint32 sourceColor, uint32 duration, bool system) {
+	_ready = false;
+	_active = true;
+
+	_red   = RGBCOLGetR(sourceColor);
+	_green = RGBCOLGetG(sourceColor);
+	_blue  = RGBCOLGetB(sourceColor);
+
+	_sourceAlpha = RGBCOLGetA(sourceColor);
+	_targetAlpha = 0;
+
+	_duration = duration;
+	_system = system;
+
+	if (_system) {
+		_startTime = g_system->getMillis();
+	} else {
+		_startTime = _gameRef->_timer;
+	}
+
+	return STATUS_OK;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+bool BaseFader::fadeOut(uint32 targetColor, uint32 duration, bool system) {
+	_ready = false;
+	_active = true;
+
+	_red   = RGBCOLGetR(targetColor);
+	_green = RGBCOLGetG(targetColor);
+	_blue  = RGBCOLGetB(targetColor);
+
+	//_sourceAlpha = 0;
+	_sourceAlpha = _currentAlpha;
+	_targetAlpha = RGBCOLGetA(targetColor);
+
+	_duration = duration;
+	_system = system;
+
+	if (_system) {
+		_startTime = g_system->getMillis();
+	} else {
+		_startTime = _gameRef->_timer;
+	}
+
+
+	return STATUS_OK;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+uint32 BaseFader::getCurrentColor() {
+	return BYTETORGBA(_red, _green, _blue, _currentAlpha);
+}
+
+
+
+//////////////////////////////////////////////////////////////////////////
+bool BaseFader::persist(BasePersistenceManager *persistMgr) {
+	BaseObject::persist(persistMgr);
+
+	persistMgr->transfer(TMEMBER(_active));
+	persistMgr->transfer(TMEMBER(_blue));
+	persistMgr->transfer(TMEMBER(_currentAlpha));
+	persistMgr->transfer(TMEMBER(_duration));
+	persistMgr->transfer(TMEMBER(_green));
+	persistMgr->transfer(TMEMBER(_red));
+	persistMgr->transfer(TMEMBER(_sourceAlpha));
+	persistMgr->transfer(TMEMBER(_startTime));
+	persistMgr->transfer(TMEMBER(_targetAlpha));
+	persistMgr->transfer(TMEMBER(_system));
+
+	if (_system && !persistMgr->getIsSaving()) {
+		_startTime = 0;
+	}
+
+	return STATUS_OK;
+}
+
+} // end of namespace Wintermute
-- 
cgit v1.2.3


From 2a6e55169530b46985d6d6af6ebcbb12e7c5a603 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Tue, 11 Sep 2012 02:51:33 +0200
Subject: WINTERMUTE: Only include base_renderer.h where needed

---
 engines/wintermute/base/base_fader.cpp | 1 +
 1 file changed, 1 insertion(+)

(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 08e6f689ba..985718fcab 100644
--- a/engines/wintermute/base/base_fader.cpp
+++ b/engines/wintermute/base/base_fader.cpp
@@ -28,6 +28,7 @@
 
 #include "engines/wintermute/base/base_fader.h"
 #include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 #include "common/util.h"
 
 namespace Wintermute {
-- 
cgit v1.2.3