diff options
| author | Strangerke | 2011-06-29 16:15:41 +0200 |
|---|---|---|
| committer | Strangerke | 2011-06-29 16:15:41 +0200 |
| commit | b0c9c9122fc678074aba30068e5b36d347208e65 (patch) | |
| tree | 79a99db08ec985f2e5f1e216823b1104d5b753fb /engines/scumm/palette.cpp | |
| parent | f2f3124246a77036f843dee2d83ad28084234ebc (diff) | |
| parent | c32a3ea0d30336771bab460ecccb58c4614e6294 (diff) | |
| download | scummvm-rg350-b0c9c9122fc678074aba30068e5b36d347208e65.tar.gz scummvm-rg350-b0c9c9122fc678074aba30068e5b36d347208e65.tar.bz2 scummvm-rg350-b0c9c9122fc678074aba30068e5b36d347208e65.zip | |
Merge branch 'master' of github.com:scummvm/scummvm into soltys_wip2
Diffstat (limited to 'engines/scumm/palette.cpp')
| -rw-r--r-- | engines/scumm/palette.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp index ba13ff46d9..51ba2195d7 100644 --- a/engines/scumm/palette.cpp +++ b/engines/scumm/palette.cpp @@ -48,11 +48,7 @@ uint8 *ScummEngine::getHEPaletteSlot(uint16 palSlot) { } uint16 ScummEngine::get16BitColor(uint8 r, uint8 g, uint8 b) { - uint16 ar = (r >> 3) << 10; - uint16 ag = (g >> 3) << 5; - uint16 ab = (b >> 3) << 0; - uint16 col = ar | ag | ab; - return col; + return _outputPixelFormat.RGBToColor(r, g, b); } void ScummEngine::resetPalette() { |