aboutsummaryrefslogtreecommitdiff
path: root/engines/xeen/interface_minimap.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2017-12-07 20:59:05 -0500
committerPaul Gilbert2017-12-07 20:59:05 -0500
commit9d85901c43d57d66bb3462d7cea32d31ad42b89b (patch)
tree28a24be35956ebd1d71a48d93dd2fec004139d4d /engines/xeen/interface_minimap.cpp
parent707182255a480ccc851d722f44f8e1d65c42574e (diff)
downloadscummvm-rg350-9d85901c43d57d66bb3462d7cea32d31ad42b89b.tar.gz
scummvm-rg350-9d85901c43d57d66bb3462d7cea32d31ad42b89b.tar.bz2
scummvm-rg350-9d85901c43d57d66bb3462d7cea32d31ad42b89b.zip
XEEN: Fixes for outdoor map drawing
Diffstat (limited to 'engines/xeen/interface_minimap.cpp')
-rw-r--r--engines/xeen/interface_minimap.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/xeen/interface_minimap.cpp b/engines/xeen/interface_minimap.cpp
index fbebd3b2ee..8ac3523a8f 100644
--- a/engines/xeen/interface_minimap.cpp
+++ b/engines/xeen/interface_minimap.cpp
@@ -1,4 +1,4 @@
-/* ScummVM - Graphic Adventure Engine
+ /* 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
@@ -74,10 +74,10 @@ void InterfaceMinimap::drawOutdoorsMinimap() {
yp += TILE_HEIGHT, --mazeY) {
for (int xp = MINIMAP_XSTART, mazeX = pt.x - MINIMAP_DIFF; mazeX <= (pt.x + MINIMAP_DIFF);
xp += TILE_WIDTH, ++mazeX) {
- v = map.mazeLookup(Common::Point(mazeX, mazeY), 4);
+ v = map.mazeLookup(Common::Point(mazeX, mazeY), 0);
frame = map.mazeDataCurrent()._surfaceTypes[v];
- if (frame != -1 && (map._currentSteppedOn || party._wizardEyeActive)) {
+ if (frame && (map._currentSteppedOn || party._wizardEyeActive)) {
map._tileSprites.draw(1, frame, Common::Point(xp, yp));
}
}
@@ -90,7 +90,7 @@ void InterfaceMinimap::drawOutdoorsMinimap() {
v = map.mazeLookup(Common::Point(mazeX, mazeY), 4);
frame = map.mazeData()._wallTypes[v];
- if (frame != -1 && (map._currentSteppedOn || party._wizardEyeActive)) {
+ if (frame && (map._currentSteppedOn || party._wizardEyeActive)) {
map._tileSprites.draw(1, frame + 16, Common::Point(xp, yp));
}
}
@@ -100,10 +100,10 @@ void InterfaceMinimap::drawOutdoorsMinimap() {
yp += TILE_HEIGHT, --mazeY) {
for (int xp = MINIMAP_XSTART, mazeX = pt.x - MINIMAP_DIFF; mazeX <= (pt.x + MINIMAP_DIFF);
xp += TILE_WIDTH, ++mazeX) {
- v = map.mazeLookup(Common::Point(mazeX, mazeY), 4);
+ frame = map.mazeLookup(Common::Point(mazeX, mazeY), 8, 0xff);
- if (v != -1 && (map._currentSteppedOn || party._wizardEyeActive)) {
- map._tileSprites.draw(1, v + 32, Common::Point(xp, yp));
+ if (frame && (map._currentSteppedOn || party._wizardEyeActive)) {
+ map._tileSprites.draw(1, frame + 32, Common::Point(xp, yp));
}
}
}