[Scummvm-cvs-logs] SF.net SVN: scummvm:[44661] scummvm/trunk/engines/sci/gui

[thebluegr at users.sourceforge.net]

Revision: 44661
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44661&view=rev
Author:   thebluegr
Date:     2009-10-05 12:37:01 +0000 (Mon, 05 Oct 2009)

Log Message:
-----------
Renamed
setCLUT() -> setPalette()
getCLUT() -> getPalette()

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui.cpp
    scummvm/trunk/engines/sci/gui/gui_gfx.cpp
    scummvm/trunk/engines/sci/gui/gui_gfx.h

Modified: scummvm/trunk/engines/sci/gui/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-05 12:12:18 UTC (rev 44660)
+++ scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-05 12:37:01 UTC (rev 44661)
@@ -251,7 +251,7 @@
 
 void SciGui::drawCel(GuiResourceId viewId, GuiViewLoopNo loopNo, GuiViewCelNo celNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo) {
 	_gfx->drawCel(viewId, loopNo, celNo, leftPos, topPos, priority, paletteNo);
-	_gfx->SetCLUT(&_gfx->_sysPalette);
+	_gfx->setPalette(&_gfx->_sysPalette);
 	_screen->copyToScreen();
 }
 
@@ -329,7 +329,7 @@
 void SciGui::paletteSetIntensity(int fromColor, int toColor, int intensity, bool setPalette) {
 	_gfx->PaletteSetIntensity(fromColor, toColor, intensity, &_gfx->_sysPalette);
 	if (setPalette) {
-		_gfx->SetCLUT(&_gfx->_sysPalette);
+		_gfx->setPalette(&_gfx->_sysPalette);
 	}
 }
 

Modified: scummvm/trunk/engines/sci/gui/gui_gfx.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_gfx.cpp	2009-10-05 12:12:18 UTC (rev 44660)
+++ scummvm/trunk/engines/sci/gui/gui_gfx.cpp	2009-10-05 12:37:01 UTC (rev 44661)
@@ -147,7 +147,7 @@
 		_sysPalette.colors[i].r = 200;
 		_sysPalette.colors[i].used = 1;
 	}
-	SetCLUT(&_sysPalette);
+	setPalette(&_sysPalette);
 }
 
 void SciGuiGfx::CreatePaletteFromData(byte *data, GuiPalette *paletteOut) {
@@ -212,7 +212,7 @@
 		MergePalettes(sciPal, &_sysPalette, flag);
 		sciPal->timestamp = _sysPalette.timestamp;
 		if (_picNotValid == 0 && systime != _sysPalette.timestamp)
-			SetCLUT(&_sysPalette);
+			setPalette(&_sysPalette);
 	}
 }
 
@@ -282,7 +282,7 @@
 	return found;
 }
 
-void SciGuiGfx::SetCLUT(GuiPalette*pal) {
+void SciGuiGfx::setPalette(GuiPalette*pal) {
 	if (pal != &_sysPalette)
 		memcpy(&_sysPalette,pal,sizeof(GuiPalette));
 	// just copy palette to system
@@ -300,9 +300,9 @@
 	_system->setPalette(bpal, 0, 256);
 }
 
-void SciGuiGfx::GetCLUT(GuiPalette*pal) {
+void SciGuiGfx::getPalette(GuiPalette*pal) {
 	if (pal != &_sysPalette)
-		memcpy(pal,&_sysPalette,sizeof(GuiPalette));
+		memcpy(pal, &_sysPalette,sizeof(GuiPalette));
 }
 
 GuiPort *SciGuiGfx::SetPort(GuiPort *newPort) {
@@ -1285,7 +1285,7 @@
 				// removing schedule
 				_palSchedules.remove_at(i);
 			}
-			SetCLUT(&_sysPalette);
+			setPalette(&_sysPalette);
 			return;
 		}
 	}

Modified: scummvm/trunk/engines/sci/gui/gui_gfx.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_gfx.h	2009-10-05 12:12:18 UTC (rev 44660)
+++ scummvm/trunk/engines/sci/gui/gui_gfx.h	2009-10-05 12:37:01 UTC (rev 44661)
@@ -55,10 +55,10 @@
 	void CreatePaletteFromData(byte *paletteData, GuiPalette *paletteOut);
 	bool SetResPalette(int16 resourceNo, int16 flag);
 	void SetPalette(GuiPalette *sciPal, int16 flag);
-	void MergePalettes(GuiPalette* pFrom, GuiPalette* pTo, uint16 flag);
-	uint16 MatchColor(GuiPalette* pPal, byte r, byte g, byte b);
-	void SetCLUT(GuiPalette*pal);
-	void GetCLUT(GuiPalette*pal);
+	void MergePalettes(GuiPalette *pFrom, GuiPalette *pTo, uint16 flag);
+	uint16 MatchColor(GuiPalette *pPal, byte r, byte g, byte b);
+	void setPalette(GuiPalette *pal);
+	void getPalette(GuiPalette *pal);
 
 	GuiPort *SetPort(GuiPort *port);
 	GuiPort *GetPort();


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