diff options
author | Jonathan Gray | 2003-03-08 06:53:32 +0000 |
---|---|---|
committer | Jonathan Gray | 2003-03-08 06:53:32 +0000 |
commit | 361e312a6c8f0520b20ae8089f444373bee49890 (patch) | |
tree | ebe669746fe43352c26f07ad46d18083a07c36cd /gui/newgui.cpp | |
parent | e4a8edfc67d77d6b7acc525db24282715deb1744 (diff) | |
download | scummvm-rg350-361e312a6c8f0520b20ae8089f444373bee49890.tar.gz scummvm-rg350-361e312a6c8f0520b20ae8089f444373bee49890.tar.bz2 scummvm-rg350-361e312a6c8f0520b20ae8089f444373bee49890.zip |
change RBG to RGB which follows the argument order and hence makes more sense...
svn-id: r6767
Diffstat (limited to 'gui/newgui.cpp')
-rw-r--r-- | gui/newgui.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gui/newgui.cpp b/gui/newgui.cpp index ca18e6cf0f..97f2182f6e 100644 --- a/gui/newgui.cpp +++ b/gui/newgui.cpp @@ -102,11 +102,11 @@ void NewGui::runLoop() { // 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::line(int x, int y, int x2, int y2, int16 color) { 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 @@ void NewGui::blendRect(int x, int y, int w, int h, int16 color, int level) { 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)); } |