From ec43c3050376c9ba9325db3a503ebcd3ec54d0ac Mon Sep 17 00:00:00 2001 From: Martin Kiewitz Date: Mon, 5 Oct 2009 18:20:50 +0000 Subject: 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 svn-id: r44669 --- engines/sci/gui/gui_gfx.cpp | 2 +- engines/sci/gui/gui_gfx.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/sci/gui') diff --git a/engines/sci/gui/gui_gfx.cpp b/engines/sci/gui/gui_gfx.cpp index 7111d681f6..4719d60648 100644 --- a/engines/sci/gui/gui_gfx.cpp +++ b/engines/sci/gui/gui_gfx.cpp @@ -300,7 +300,7 @@ void SciGuiGfx::setScreenPalette(GuiPalette*pal) { _system->setPalette(bpal, 0, 256); } -void SciGuiGfx::getScreenPalette(GuiPalette*pal) { +void SciGuiGfx::getSysPalette(GuiPalette*pal) { if (pal != &_sysPalette) memcpy(pal, &_sysPalette,sizeof(GuiPalette)); } diff --git a/engines/sci/gui/gui_gfx.h b/engines/sci/gui/gui_gfx.h index fd9a22eb3b..224d198bbc 100644 --- a/engines/sci/gui/gui_gfx.h +++ b/engines/sci/gui/gui_gfx.h @@ -58,7 +58,7 @@ public: 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(); -- cgit v1.2.3