Renamed palette functions.

svn-id: r28365

4 files changed, 10 insertions, 10 deletions

diff --git a/engines/parallaction/callables_ns.cpp b/engines/parallaction/callables_ns.cpp
index b124ba864a..9b3972723f 100644
--- a/engines/parallaction/callables_ns.cpp
+++ b/engines/parallaction/callables_ns.cpp
@@ -205,7 +205,7 @@ void Parallaction_ns::_c_fade(void *parm) {
 	memset(pal, 0, sizeof(Gfx::Palette));
 
 	for (uint16 _di = 0; _di < 64; _di++) {
-		_gfx->fadePalette(pal);
+		_gfx->fadeInPalette(pal);
 		_gfx->setPalette(pal);
 
 		g_system->delayMillis(20);
@@ -341,7 +341,7 @@ void Parallaction_ns::_c_endComment(void *param) {
 	byte* _enginePal = _gfx->_palette;
 	Gfx::Palette pal;
 
-	_gfx->buildBWPalette(pal);
+	_gfx->makeGrayscalePalette(pal);
 
 	int16 w = 0, h = 0;
 	_gfx->getStringExtent(_location._endComment, 130, &w, &h);
diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp
index 04f2ef1040..948f2a7b34 100644
--- a/engines/parallaction/graphics.cpp
+++ b/engines/parallaction/graphics.cpp
@@ -203,14 +203,14 @@ void Gfx::animatePalette() {
 	return;
 }
 
-void Gfx::fadePalette(Palette pal) {
+void Gfx::fadeInPalette(Palette pal) {
 	for (uint16 i = 0; i < BASE_PALETTE_COLORS * 3; i++)
 		if (pal[i] < _palette[i]) pal[i]++;
 
 	return;
 }
 
-void Gfx::buildBWPalette(Palette pal) {
+void Gfx::makeGrayscalePalette(Palette pal) {
 
 	for (uint16 i = 0; i < BASE_PALETTE_COLORS; i++) {
 		byte max;
@@ -226,7 +226,7 @@ void Gfx::buildBWPalette(Palette pal) {
 	return;
 }
 
-void Gfx::quickFadePalette(Palette pal) {
+void Gfx::fadePalette(Palette pal) {
 
 	for (uint16 i = 0; i < BASE_PALETTE_COLORS * 3; i++) {
 		if (pal[i] == _palette[i]) continue;
diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h
index 6f0f7996d3..11589b22cd 100644
--- a/engines/parallaction/graphics.h
+++ b/engines/parallaction/graphics.h
@@ -209,9 +209,9 @@ public:
 	void setPalette(Palette palette, uint32 first = FIRST_BASE_COLOR, uint32 num = BASE_PALETTE_COLORS);
 	void setBlackPalette();
 	void animatePalette();
-	void fadePalette(Palette palette);
-	void buildBWPalette(Palette palette);
-	void quickFadePalette(Palette palette);
+	void fadeInPalette(Palette palette);		// fades palette (from black) to system palette
+	void fadePalette(Palette palette);			// fades palette to system palette
+	void makeGrayscalePalette(Palette palette);		// transform palette into black and white
 
 	// amiga specific
 	void setHalfbriteMode(bool enable);
diff --git a/engines/parallaction/location.cpp b/engines/parallaction/location.cpp
index 34d2dd6a18..e689a8e82d 100644
--- a/engines/parallaction/location.cpp
+++ b/engines/parallaction/location.cpp
@@ -424,7 +424,7 @@ void Parallaction::doLocationEnterTransition() {
     }
 
 	byte pal[PALETTE_SIZE];
-	_gfx->buildBWPalette(pal);
+	_gfx->makeGrayscalePalette(pal);
 	_gfx->setPalette(pal);
 
 	jobRunScripts(NULL, NULL);
@@ -452,7 +452,7 @@ void Parallaction::doLocationEnterTransition() {
 
 	// fades maximum intensity palette towards approximation of main palette
 	for (uint16 _si = 0; _si<6; _si++) {
-		_gfx->quickFadePalette(pal);
+		_gfx->fadePalette(pal);
 		_gfx->setPalette(pal);
 		waitTime( 1 );
 		_gfx->updateScreen();