diff options
author | Paul Gilbert | 2014-03-01 17:28:24 -0500 |
---|---|---|
committer | Paul Gilbert | 2014-03-01 17:28:24 -0500 |
commit | 7880ae0b18c3e2a25ed1c4a2bc42e22066d1ff3e (patch) | |
tree | 96de4f3470bd9bcc81bbae82a3e1c59f523a8edf /engines/cge/vga13h.cpp | |
parent | badb8d97444767b7d8fea0f877ac044249696a5f (diff) | |
parent | 2218d14fb5276724c757406d5ac1ec581160721b (diff) | |
download | scummvm-rg350-7880ae0b18c3e2a25ed1c4a2bc42e22066d1ff3e.tar.gz scummvm-rg350-7880ae0b18c3e2a25ed1c4a2bc42e22066d1ff3e.tar.bz2 scummvm-rg350-7880ae0b18c3e2a25ed1c4a2bc42e22066d1ff3e.zip |
Merge branch 'master' into mads
Diffstat (limited to 'engines/cge/vga13h.cpp')
-rw-r--r-- | engines/cge/vga13h.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp index b469c7197d..d5e1be5122 100644 --- a/engines/cge/vga13h.cpp +++ b/engines/cge/vga13h.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -761,7 +761,7 @@ void Vga::setColors(Dac *tab, int lum) { if (_mono) { destP = _newColors; for (int idx = 0; idx < kPalCount; idx++, destP++) { - // Form a greyscalce colour from 30% R, 59% G, 11% B + // Form a greyscalce color from 30% R, 59% G, 11% B uint8 intensity = (((int)destP->_r * 77) + ((int)destP->_g * 151) + ((int)destP->_b * 28)) >> 8; destP->_r = intensity; destP->_g = intensity; |