ILLUSIONS: Move palette code from Screen to new ScreenPalette class

1 files changed, 5 insertions, 38 deletions

diff --git a/engines/illusions/illusions.cpp b/engines/illusions/illusions.cpp
index e22ef0c316..9bb40c344c 100644
--- a/engines/illusions/illusions.cpp
+++ b/engines/illusions/illusions.cpp
@@ -206,14 +206,14 @@ int IllusionsEngine::updateGraphics(uint flags) {
 	return kUFNext;
 }
 
-int IllusionsEngine::updateSprites(uint flags) {
-	_screen->updateSprites();
-	_screen->updatePalette();
+int IllusionsEngine::updateSoundMan(uint flags) {
+	_soundMan->update();
 	return kUFNext;
 }
 
-int IllusionsEngine::updateSoundMan(uint flags) {
-	_soundMan->update();
+int IllusionsEngine::updateSprites(uint flags) {
+	_screen->updateSprites();
+	_screenPalette->updatePalette();
 	return kUFNext;
 }
 
@@ -267,39 +267,6 @@ bool IllusionsEngine::isSoundActive() {
 	return true;
 }
 
-void IllusionsEngine::updateFader() {
-	if (_fader && !_fader->_paused && _fader->_active) {
-		int32 currTime = getCurrentTime();
-		int32 currDuration = currTime - _fader->_startTime;
-		if (currDuration) {
-			int newValue;
-			if (currDuration >= _fader->_duration) {
-				newValue = _fader->_maxValue;
-			} else {
-				newValue = (currDuration * (_fader->_maxValue - _fader->_minValue) / _fader->_duration) + _fader->_minValue;
-			}
-			if (_fader->_currValue != newValue) {
-				_fader->_currValue = newValue;
-				_screen->setFader(newValue, _fader->_firstIndex, _fader->_lastIndex);
-			}
-			if (_fader->_currValue == _fader->_maxValue) {
-				_fader->_active = false;
-				notifyThreadId(_fader->_notifyThreadId);
-			}
-		}
-	}
-}
-
-void IllusionsEngine::pauseFader() {
-	_fader->_paused = true;
-	_fader->_startTime = getCurrentTime() - _fader->_startTime;
-}
-
-void IllusionsEngine::unpauseFader() {
-	_fader->_startTime = getCurrentTime() - _fader->_startTime;
-	_fader->_paused = false;
-}
-
 void IllusionsEngine::setCurrFontId(uint32 fontId) {
 	_fontId = fontId;
 }