diff options
| author | David Corrales | 2007-05-31 23:44:43 +0000 |
|---|---|---|
| committer | David Corrales | 2007-05-31 23:44:43 +0000 |
| commit | 0cab5b7791e56b32455748bf20c21f0d6b42f654 (patch) | |
| tree | 9e6580328542f1db230e019ba77e3db1be8fa50b /engines/agos/window.cpp | |
| parent | 6c69d531d262e14fa02b6e1adb42baaa5c74dbe6 (diff) | |
| parent | 22c0403e0dfec16badf156afa842c6c37e850263 (diff) | |
| download | scummvm-rg350-0cab5b7791e56b32455748bf20c21f0d6b42f654.tar.gz scummvm-rg350-0cab5b7791e56b32455748bf20c21f0d6b42f654.tar.bz2 scummvm-rg350-0cab5b7791e56b32455748bf20c21f0d6b42f654.zip | |
Merged the fs branch with trunk. r26949:27031
svn-id: r27032
Diffstat (limited to 'engines/agos/window.cpp')
| -rw-r--r-- | engines/agos/window.cpp | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/engines/agos/window.cpp b/engines/agos/window.cpp index d3b6c1b8cd..94436b0560 100644 --- a/engines/agos/window.cpp +++ b/engines/agos/window.cpp @@ -1,6 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2001 Ludvig Strigeus - * Copyright (C) 2001-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -123,6 +125,10 @@ void AGOSEngine::colorWindow(WindowBlock *window) { dst += _screenWidth; } } else { + dst = getFrontBuf() + _dxSurfacePitch * (window->y) + window->x * 8; + h = window->height * 8; + w = window->width * 8; + if (getGameType() == GType_ELVIRA2 && window->y == 146) { if (window->fill_color == 1) { _displayPalette[33 * 4 + 0] = 48 * 4; @@ -134,12 +140,11 @@ void AGOSEngine::colorWindow(WindowBlock *window) { _displayPalette[33 * 4 + 2] = 40 * 4; } - _paletteFlag = 2; - } + dst -= _dxSurfacePitch; + h += 2; - dst = getFrontBuf() + _dxSurfacePitch * window->y + window->x * 8; - h = window->height * 8; - w = window->width * 8; + _paletteFlag = 1; + } uint8 color = window->fill_color; if (getGameType() == GType_ELVIRA2 || getGameType() == GType_WW) |