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

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Mon Oct 5 20:20:50 CEST 2009


Revision: 44669
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44669&view=rev
Author:   m_kiewitz
Date:     2009-10-05 18:20:50 +0000 (Mon, 05 Oct 2009)

Log Message:
-----------
SVN/newgui: renamed getScreenPalette to getSysPalette (code doesnt get the screen palette at all, but actually the current sysPalette which does not need to be active at all times

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

Modified: scummvm/trunk/engines/sci/gui/gui_gfx.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_gfx.cpp	2009-10-05 18:00:12 UTC (rev 44668)
+++ scummvm/trunk/engines/sci/gui/gui_gfx.cpp	2009-10-05 18:20:50 UTC (rev 44669)
@@ -300,7 +300,7 @@
 	_system->setPalette(bpal, 0, 256);
 }
 
-void SciGuiGfx::getScreenPalette(GuiPalette*pal) {
+void SciGuiGfx::getSysPalette(GuiPalette*pal) {
 	if (pal != &_sysPalette)
 		memcpy(pal, &_sysPalette,sizeof(GuiPalette));
 }

Modified: scummvm/trunk/engines/sci/gui/gui_gfx.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_gfx.h	2009-10-05 18:00:12 UTC (rev 44668)
+++ scummvm/trunk/engines/sci/gui/gui_gfx.h	2009-10-05 18:20:50 UTC (rev 44669)
@@ -58,7 +58,7 @@
 	void MergePalettes(GuiPalette *pFrom, GuiPalette *pTo, uint16 flag);
 	uint16 MatchColor(GuiPalette *pPal, byte r, byte g, byte b);
 	void setScreenPalette(GuiPalette *pal);
-	void getScreenPalette(GuiPalette *pal);
+	void getSysPalette(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.




More information about the Scummvm-git-logs mailing list