aboutsummaryrefslogtreecommitdiff
path: root/engines/agos
diff options
context:
space:
mode:
authorTravis Howell2007-05-27 11:46:42 +0000
committerTravis Howell2007-05-27 11:46:42 +0000
commit5f84a9ce71d239b2e1533de997fdd994d1e8a6c6 (patch)
treeb53d85ccb9c5916d688c7f608b1cc974ca3db646 /engines/agos
parent5cc524d17e91930abc9137b5b6a0106c64bf66a4 (diff)
downloadscummvm-rg350-5f84a9ce71d239b2e1533de997fdd994d1e8a6c6.tar.gz
scummvm-rg350-5f84a9ce71d239b2e1533de997fdd994d1e8a6c6.tar.bz2
scummvm-rg350-5f84a9ce71d239b2e1533de997fdd994d1e8a6c6.zip
Add minor code differences in Elvira 2 and Waxworks.
svn-id: r26969
Diffstat (limited to 'engines/agos')
-rw-r--r--engines/agos/vga.cpp6
-rw-r--r--engines/agos/window.cpp13
2 files changed, 12 insertions, 7 deletions
diff --git a/engines/agos/vga.cpp b/engines/agos/vga.cpp
index eb2d1391ce..d89070cb23 100644
--- a/engines/agos/vga.cpp
+++ b/engines/agos/vga.cpp
@@ -1258,8 +1258,10 @@ void AGOSEngine::vc37_pokePalette() {
palptr[2] = ((color & 0x00f) >> 0) * 32;
palptr[3] = 0;
- _paletteFlag = 2;
- _vgaSpriteChanged++;
+ if (_lockWord & 0x20) {
+ _paletteFlag = 1;
+ _displayScreen++;
+ }
}
void AGOSEngine::vc38_ifVarNotZero() {
diff --git a/engines/agos/window.cpp b/engines/agos/window.cpp
index d3b6c1b8cd..1a37d59102 100644
--- a/engines/agos/window.cpp
+++ b/engines/agos/window.cpp
@@ -123,6 +123,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 +138,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)