thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
svn-id: r44669
This commit is contained in:
Martin Kiewitz 2009-10-05 18:20:50 +00:00
parent 2a06f34181
commit ec43c30503
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/sci/gui/gui_gfx.cpp
View file

@ -300,7 +300,7 @@ void SciGuiGfx::setScreenPalette(GuiPalette*pal) {
_system->setPalette(bpal, 0, 256); _system->setPalette(bpal, 0, 256);
} }
void SciGuiGfx::getScreenPalette(GuiPalette*pal) { void SciGuiGfx::getSysPalette(GuiPalette*pal) {
if (pal != &_sysPalette) if (pal != &_sysPalette)
memcpy(pal, &_sysPalette,sizeof(GuiPalette)); memcpy(pal, &_sysPalette,sizeof(GuiPalette));
} }

2
engines/sci/gui/gui_gfx.h
View file

@ -58,7 +58,7 @@ public:
void MergePalettes(GuiPalette *pFrom, GuiPalette *pTo, uint16 flag); void MergePalettes(GuiPalette *pFrom, GuiPalette *pTo, uint16 flag);
uint16 MatchColor(GuiPalette *pPal, byte r, byte g, byte b); uint16 MatchColor(GuiPalette *pPal, byte r, byte g, byte b);
void setScreenPalette(GuiPalette *pal); void setScreenPalette(GuiPalette *pal);
void getScreenPalette(GuiPalette *pal); void getSysPalette(GuiPalette *pal);
GuiPort *SetPort(GuiPort *port); GuiPort *SetPort(GuiPort *port);
GuiPort *GetPort(); GuiPort *GetPort();