aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/gui
diff options
context:
space:
mode:
authorMartin Kiewitz2009-10-05 18:20:50 +0000
committerMartin Kiewitz2009-10-05 18:20:50 +0000
commitec43c3050376c9ba9325db3a503ebcd3ec54d0ac (patch)
tree49a1ea658ca89feadea0e84abf3f2be6178cc30e /engines/sci/gui
parent2a06f341811da796f28ae07dc03cb54e5c2850fe (diff)
downloadscummvm-rg350-ec43c3050376c9ba9325db3a503ebcd3ec54d0ac.tar.gz
scummvm-rg350-ec43c3050376c9ba9325db3a503ebcd3ec54d0ac.tar.bz2
scummvm-rg350-ec43c3050376c9ba9325db3a503ebcd3ec54d0ac.zip
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
Diffstat (limited to 'engines/sci/gui')
-rw-r--r--engines/sci/gui/gui_gfx.cpp2
-rw-r--r--engines/sci/gui/gui_gfx.h2
2 files changed, 2 insertions, 2 deletions
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();