aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authorJonathan Gray2003-03-08 06:53:32 +0000
committerJonathan Gray2003-03-08 06:53:32 +0000
commit361e312a6c8f0520b20ae8089f444373bee49890 (patch)
treeebe669746fe43352c26f07ad46d18083a07c36cd /backends
parente4a8edfc67d77d6b7acc525db24282715deb1744 (diff)
downloadscummvm-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 'backends')
-rw-r--r--backends/morphos/morphos.cpp2
-rw-r--r--backends/sdl/sdl-common.cpp6
-rw-r--r--backends/sdl/sdl-common.h6
3 files changed, 7 insertions, 7 deletions
diff --git a/backends/morphos/morphos.cpp b/backends/morphos/morphos.cpp
index 36515463f5..065b4e1021 100644
--- a/backends/morphos/morphos.cpp
+++ b/backends/morphos/morphos.cpp
@@ -1543,7 +1543,7 @@ void OSystem_MorphOS::copy_rect_overlay(const int16 *ovl, int pitch, int x, int
int16 col;
col = *ovl++;
- colorToRBG(col, r, g, b);
+ colorToRGB(col, r, g, b);
*dest++ = r;
*dest++ = g;
*dest++ = b;
diff --git a/backends/sdl/sdl-common.cpp b/backends/sdl/sdl-common.cpp
index bb7cce2027..b9f1816c1c 100644
--- a/backends/sdl/sdl-common.cpp
+++ b/backends/sdl/sdl-common.cpp
@@ -925,7 +925,7 @@ void OSystem_SDL_Common::draw_mouse() {
*bak++ = *dst;
color = *src++;
if (color != 0xFF) // 0xFF = transparent, don't draw
- *dst = RBGToColor(_currentPalette[color].r, _currentPalette[color].g, _currentPalette[color].b);
+ *dst = RGBToColor(_currentPalette[color].r, _currentPalette[color].g, _currentPalette[color].b);
dst++;
width--;
}
@@ -1230,10 +1230,10 @@ void OSystem_SDL_Common::copy_rect_overlay(const int16 *buf, int pitch, int x, i
SDL_UnlockSurface(_tmpscreen);
}
-int16 OSystem_SDL_Common::RBGToColor(uint8 r, uint8 g, uint8 b) {
+int16 OSystem_SDL_Common::RGBToColor(uint8 r, uint8 g, uint8 b) {
return SDL_MapRGB(_tmpscreen->format, r, g, b);
}
-void OSystem_SDL_Common::colorToRBG(int16 color, uint8 &r, uint8 &g, uint8 &b) {
+void OSystem_SDL_Common::colorToRGB(int16 color, uint8 &r, uint8 &g, uint8 &b) {
SDL_GetRGB(color, _tmpscreen->format, &r, &g, &b);
}
diff --git a/backends/sdl/sdl-common.h b/backends/sdl/sdl-common.h
index ab37cda31e..e8d54ea3e3 100644
--- a/backends/sdl/sdl-common.h
+++ b/backends/sdl/sdl-common.h
@@ -117,9 +117,9 @@ public:
virtual int16 get_height();
virtual int16 get_width();
- // Methods that convert RBG to/from colors suitable for the overlay.
- virtual int16 RBGToColor(uint8 r, uint8 g, uint8 b);
- virtual void colorToRBG(int16 color, uint8 &r, uint8 &g, uint8 &b);
+ // Methods that convert RGB to/from colors suitable for the overlay.
+ virtual int16 RGBToColor(uint8 r, uint8 g, uint8 b);
+ virtual void colorToRGB(int16 color, uint8 &r, uint8 &g, uint8 &b);
static OSystem *create(int gfx_mode, bool full_screen);