[Scummvm-cvs-logs] SF.net SVN: scummvm:[41943] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 41943
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41943&view=rev
Author:   lordhoto
Date:     2009-06-29 16:06:18 +0000 (Mon, 29 Jun 2009)

Log Message:
-----------
Changed LoLEngine::setPaletteBrightness to take an Palette object.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/gui_lol.cpp
    scummvm/trunk/engines/kyra/lol.cpp
    scummvm/trunk/engines/kyra/lol.h
    scummvm/trunk/engines/kyra/scene_lol.cpp
    scummvm/trunk/engines/kyra/script_lol.cpp

Modified: scummvm/trunk/engines/kyra/gui_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lol.cpp	2009-06-29 16:06:02 UTC (rev 41942)
+++ scummvm/trunk/engines/kyra/gui_lol.cpp	2009-06-29 16:06:18 UTC (rev 41943)
@@ -1814,7 +1814,7 @@
 	displayAutomap();
 
 	gui_drawPlayField();
-	setPaletteBrightness(_screen->getPalette(0).getData(), _brightness, _lampEffect);
+	setPaletteBrightness(_screen->getPalette(0), _brightness, _lampEffect);
 	return 1;
 }
 
@@ -1842,7 +1842,7 @@
 	}
 
 	if (_brightness)
-		setPaletteBrightness(_screen->getPalette(0).getData(), _brightness, _lampEffect);
+		setPaletteBrightness(_screen->getPalette(0), _brightness, _lampEffect);
 
 	return 1;
 }

Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp	2009-06-29 16:06:02 UTC (rev 41942)
+++ scummvm/trunk/engines/kyra/lol.cpp	2009-06-29 16:06:18 UTC (rev 41943)
@@ -1538,7 +1538,7 @@
 		if (_screen->_fadeFlag != 2)
 			_screen->fadeClearSceneWindow(10);
 		gui_drawPlayField();
-		setPaletteBrightness(_screen->getPalette(0).getData(), _brightness, _lampEffect);
+		setPaletteBrightness(_screen->getPalette(0), _brightness, _lampEffect);
 		_screen->_fadeFlag = 0;
 	}
 
@@ -1672,8 +1672,8 @@
 	}
 }
 
-void LoLEngine::setPaletteBrightness(uint8 *palette, int brightness, int modifier) {
-	generateBrightnessPalette(palette, _screen->getPalette(1).getData(), brightness, modifier);
+void LoLEngine::setPaletteBrightness(Palette &pal, int brightness, int modifier) {
+	generateBrightnessPalette(pal.getData(), _screen->getPalette(1).getData(), brightness, modifier);
 	_screen->fadePalette(_screen->getPalette(1), 5, 0);
 	_screen->_fadeFlag = 0;
 }

Modified: scummvm/trunk/engines/kyra/lol.h
===================================================================
--- scummvm/trunk/engines/kyra/lol.h	2009-06-29 16:06:02 UTC (rev 41942)
+++ scummvm/trunk/engines/kyra/lol.h	2009-06-29 16:06:18 UTC (rev 41943)
@@ -872,7 +872,7 @@
 	void toggleSelectedCharacterFrame(bool mode);
 	void fadeText();
 	void transformRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPage, int dstPage);
-	void setPaletteBrightness(uint8 *palette, int brightness, int modifier);
+	void setPaletteBrightness(Palette &pal, int brightness, int modifier);
 	void generateBrightnessPalette(uint8 *src, uint8 *dst, int brightness, int modifier);
 	void generateFlashPalette(uint8 *src, uint8 *dst, int colorFlags);
 	void updateSequenceBackgroundAnimations();

Modified: scummvm/trunk/engines/kyra/scene_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_lol.cpp	2009-06-29 16:06:02 UTC (rev 41942)
+++ scummvm/trunk/engines/kyra/scene_lol.cpp	2009-06-29 16:06:18 UTC (rev 41943)
@@ -94,7 +94,7 @@
 
 	gui_drawPlayField();
 
-	setPaletteBrightness(_screen->getPalette(0).getData(), _brightness, _lampEffect);
+	setPaletteBrightness(_screen->getPalette(0), _brightness, _lampEffect);
 	setMouseCursorToItemInHand();
 
 	snd_playTrack(_curMusicTheme);
@@ -544,14 +544,14 @@
 	if (!_brightness || !_lampOilStatus) {
 		newLampEffect = 8;
 		if (newLampEffect != _lampEffect && _screen->_fadeFlag == 0)
-			setPaletteBrightness(_screen->getPalette(0).getData(), _brightness, newLampEffect);
+			setPaletteBrightness(_screen->getPalette(0), _brightness, newLampEffect);
 	} else {
 		tmpOilStatus = (_lampOilStatus < 100) ? _lampOilStatus : 100;
 		newLampEffect = (3 - ((tmpOilStatus - 1) / 25)) << 1;
 
 		if (_lampEffect == -1) {
 			if (_screen->_fadeFlag == 0)
-				setPaletteBrightness(_screen->getPalette(0).getData(), _brightness, newLampEffect);
+				setPaletteBrightness(_screen->getPalette(0), _brightness, newLampEffect);
 			_lampStatusTimer = _system->getMillis() + (10 + _rnd.getRandomNumberRng(1, 30)) * _tickLength;
 		} else {
 			if ((_lampEffect & 0xfe) == (newLampEffect & 0xfe)) {
@@ -563,7 +563,7 @@
 				}
 			} else {
 				if (_screen->_fadeFlag == 0)
-					setPaletteBrightness(_screen->getPalette(0).getData(), _lampEffect, newLampEffect);
+					setPaletteBrightness(_screen->getPalette(0), _lampEffect, newLampEffect);
 			}
 		}
 	}
@@ -1491,7 +1491,7 @@
 		if (redrawPlayField)
 			gui_drawPlayField();
 
-		setPaletteBrightness(_screen->getPalette(0).getData(), _brightness, _lampEffect);
+		setPaletteBrightness(_screen->getPalette(0), _brightness, _lampEffect);
 
 	} else {
 		_currentControlMode = 0;

Modified: scummvm/trunk/engines/kyra/script_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lol.cpp	2009-06-29 16:06:02 UTC (rev 41942)
+++ scummvm/trunk/engines/kyra/script_lol.cpp	2009-06-29 16:06:18 UTC (rev 41943)
@@ -876,7 +876,7 @@
 	if (_screen->_fadeFlag != 2)
 		_screen->fadeClearSceneWindow(10);
 	gui_drawPlayField();
-	setPaletteBrightness(_screen->getPalette(0).getData(), _brightness, _lampEffect);
+	setPaletteBrightness(_screen->getPalette(0), _brightness, _lampEffect);
 	_screen->_fadeFlag = 0;
 	return 1;
 }
@@ -1428,7 +1428,7 @@
 	uint16 old = _brightness;
 	_brightness = stackPos(0);
 	if (stackPos(1) == 1)
-		setPaletteBrightness(_screen->getPalette(0).getData(), stackPos(0), _lampEffect);
+		setPaletteBrightness(_screen->getPalette(0), stackPos(0), _lampEffect);
 	return old;
 }
 
@@ -2420,7 +2420,7 @@
 		if (_screen->_fadeFlag != 2)
 			_screen->fadeClearSceneWindow(10);
 		gui_drawPlayField();
-		setPaletteBrightness(_screen->getPalette(0).getData(), _brightness, _lampEffect);
+		setPaletteBrightness(_screen->getPalette(0), _brightness, _lampEffect);
 		_screen->_fadeFlag = 0;
 		break;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.