[Scummvm-cvs-logs] CVS: scummvm/gui newgui.cpp,1.42,1.43
Jonathan Gray
khalek at users.sourceforge.net
Fri Mar 7 22:54:04 CET 2003
Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv21807
Modified Files:
newgui.cpp
Log Message:
change RBG to RGB which follows the argument order and hence makes more sense...
Index: newgui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- newgui.cpp 6 Mar 2003 21:45:42 -0000 1.42
+++ newgui.cpp 8 Mar 2003 06:53:32 -0000 1.43
@@ -102,11 +102,11 @@
// different color modes (555 vs 565) might be used depending on the resolution
// (e.g. that's the case on my system), so we still end up with wrong colors in those
// sitauations. At least now the user can fix it by closing and reopening the GUI.
- _bgcolor = _system->RBGToColor(0, 0, 0);
- _color = _system->RBGToColor(96, 96, 96);
- _shadowcolor = _system->RBGToColor(64, 64, 64);
- _textcolor = _system->RBGToColor(32, 160, 32);
- _textcolorhi = _system->RBGToColor(0, 255, 0);
+ _bgcolor = _system->RGBToColor(0, 0, 0);
+ _color = _system->RGBToColor(96, 96, 96);
+ _shadowcolor = _system->RGBToColor(64, 64, 64);
+ _textcolor = _system->RGBToColor(32, 160, 32);
+ _textcolorhi = _system->RGBToColor(0, 255, 0);
if (!_stateIsSaved) {
saveState();
@@ -305,7 +305,7 @@
void NewGui::blendRect(int x, int y, int w, int h, int16 color, int level) {
int r, g, b;
uint8 ar, ag, ab;
- _system->colorToRBG(color, ar, ag, ab);
+ _system->colorToRGB(color, ar, ag, ab);
r = ar * level;
g = ag * level;
b = ab * level;
@@ -314,8 +314,8 @@
while (h--) {
for (int i = 0; i < w; i++) {
- _system->colorToRBG(ptr[i], ar, ag, ab);
- ptr[i] = _system->RBGToColor((ar+r)/(level+1),
+ _system->colorToRGB(ptr[i], ar, ag, ab);
+ ptr[i] = _system->RGBToColor((ar+r)/(level+1),
(ag+g)/(level+1),
(ab+b)/(level+1));
}
More information about the Scummvm-git-logs
mailing list