diff options
| author | Johannes Schickel | 2010-01-25 01:39:44 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-01-25 01:39:44 +0000 |
| commit | aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2 (patch) | |
| tree | 95f119e687a666f65aad5041910c43bdfd4f2929 /engines/kyra/screen_lol.cpp | |
| parent | ec14cd6e6add76ce4f719edd7ce508d67ebd9f14 (diff) | |
| download | scummvm-rg350-aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2.tar.gz scummvm-rg350-aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2.tar.bz2 scummvm-rg350-aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2.zip | |
Strip trailing spaces/tabs.
svn-id: r47541
Diffstat (limited to 'engines/kyra/screen_lol.cpp')
| -rw-r--r-- | engines/kyra/screen_lol.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/screen_lol.cpp b/engines/kyra/screen_lol.cpp index f15c8dd612..6b94043005 100644 --- a/engines/kyra/screen_lol.cpp +++ b/engines/kyra/screen_lol.cpp @@ -191,7 +191,7 @@ uint8 *Screen_LoL::generateLevelOverlay(const Palette &srcPal, uint8 *ovl, int o weight = 255; const uint8 *srt = srcPal.getData(); - + uint16 r = srt[opColor * 3]; uint16 g = srt[opColor * 3 + 1]; uint16 b = srt[opColor * 3 + 2]; @@ -848,7 +848,7 @@ void Screen_LoL::fadeToPalette1(int delay) { void Screen_LoL::loadSpecialColors(Palette &dst) { if (_use16ColorMode) return; - + dst.copy(*_screenPalette, 192, 4); } @@ -941,9 +941,9 @@ bool Screen_LoL::fadePaletteStep(uint8 *pal1, uint8 *pal2, uint32 elapsedTime, u Palette **Screen_LoL::generateFadeTable(Palette **dst, Palette *src1, Palette *src2, int numTabs) { int len = _use16ColorMode ? 48 : 768; - if (!src1) + if (!src1) src1 = _screenPalette; - + uint8 *p1 = (*dst++)->getData(); uint8 *p2 = src1->getData(); uint8 *p3 = src2->getData(); |