[Scummvm-cvs-logs] SF.net SVN: scummvm:[44662] scummvm/trunk/engines/sci/gui
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Mon Oct 5 14:49:34 CEST 2009
Revision: 44662
http://scummvm.svn.sourceforge.net/scummvm/?rev=44662&view=rev
Author: thebluegr
Date: 2009-10-05 12:49:31 +0000 (Mon, 05 Oct 2009)
Log Message:
-----------
Better naming for the palette setting functions, to disambiguate them from the existing ones
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:37:01 UTC (rev 44661)
+++ scummvm/trunk/engines/sci/gui/gui.cpp 2009-10-05 12:49:31 UTC (rev 44662)
@@ -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->setPalette(&_gfx->_sysPalette);
+ _gfx->setScreenPalette(&_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->setPalette(&_gfx->_sysPalette);
+ _gfx->setScreenPalette(&_gfx->_sysPalette);
}
}
Modified: scummvm/trunk/engines/sci/gui/gui_gfx.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_gfx.cpp 2009-10-05 12:37:01 UTC (rev 44661)
+++ scummvm/trunk/engines/sci/gui/gui_gfx.cpp 2009-10-05 12:49:31 UTC (rev 44662)
@@ -147,7 +147,7 @@
_sysPalette.colors[i].r = 200;
_sysPalette.colors[i].used = 1;
}
- setPalette(&_sysPalette);
+ setScreenPalette(&_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)
- setPalette(&_sysPalette);
+ setScreenPalette(&_sysPalette);
}
}
@@ -282,7 +282,7 @@
return found;
}
-void SciGuiGfx::setPalette(GuiPalette*pal) {
+void SciGuiGfx::setScreenPalette(GuiPalette*pal) {
if (pal != &_sysPalette)
memcpy(&_sysPalette,pal,sizeof(GuiPalette));
// just copy palette to system
@@ -300,7 +300,7 @@
_system->setPalette(bpal, 0, 256);
}
-void SciGuiGfx::getPalette(GuiPalette*pal) {
+void SciGuiGfx::getScreenPalette(GuiPalette*pal) {
if (pal != &_sysPalette)
memcpy(pal, &_sysPalette,sizeof(GuiPalette));
}
@@ -1285,7 +1285,7 @@
// removing schedule
_palSchedules.remove_at(i);
}
- setPalette(&_sysPalette);
+ setScreenPalette(&_sysPalette);
return;
}
}
Modified: scummvm/trunk/engines/sci/gui/gui_gfx.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_gfx.h 2009-10-05 12:37:01 UTC (rev 44661)
+++ scummvm/trunk/engines/sci/gui/gui_gfx.h 2009-10-05 12:49:31 UTC (rev 44662)
@@ -57,8 +57,8 @@
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 setPalette(GuiPalette *pal);
- void getPalette(GuiPalette *pal);
+ void setScreenPalette(GuiPalette *pal);
+ void getScreenPalette(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