aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2015-06-14 17:03:33 -0400
committerPaul Gilbert2015-06-14 17:03:33 -0400
commitda3e0de1f90709f30663c691b1df7a2c9e9fe875 (patch)
treed0395605d19eb923f0db9fb29576968e5adee662 /engines
parent8429adcb5109fb7334cb96560abe051b72b28044 (diff)
downloadscummvm-rg350-da3e0de1f90709f30663c691b1df7a2c9e9fe875.tar.gz
scummvm-rg350-da3e0de1f90709f30663c691b1df7a2c9e9fe875.tar.bz2
scummvm-rg350-da3e0de1f90709f30663c691b1df7a2c9e9fe875.zip
SHERLOCK: RT: Fix rendering name surface on map
Diffstat (limited to 'engines')
-rw-r--r--engines/sherlock/scene.cpp2
-rw-r--r--engines/sherlock/tattoo/tattoo_map.cpp18
2 files changed, 10 insertions, 10 deletions
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 32da61a64f..3f19447f04 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -817,7 +817,7 @@ bool Scene::loadScene(const Common::String &filename) {
roomStream->seek(header3DO_walkData_offset);
int startPos = roomStream->pos();
- while ((roomStream->pos() - startPos) < header3DO_walkData_size) {
+ while ((roomStream->pos() - startPos) < (int)header3DO_walkData_size) {
_walkPoints.push_back(WalkArray());
_walkPoints[_walkPoints.size() - 1]._fileOffset = roomStream->pos() - startPos;
_walkPoints[_walkPoints.size() - 1].load(*roomStream, false);
diff --git a/engines/sherlock/tattoo/tattoo_map.cpp b/engines/sherlock/tattoo/tattoo_map.cpp
index d8872171cb..72834285cf 100644
--- a/engines/sherlock/tattoo/tattoo_map.cpp
+++ b/engines/sherlock/tattoo/tattoo_map.cpp
@@ -425,15 +425,15 @@ void TattooMap::checkMapNames(bool slamIt) {
int yp = screen.stringHeight(line2);
xp = (width - screen.stringWidth(line2)) / 2;
// CHECKME: Shouldn't we use yp for drawing line2?
- _textBuffer->writeString(line2, Common::Point(xp + 0, 0), BLACK);
- _textBuffer->writeString(line2, Common::Point(xp + 1, 0), BLACK);
- _textBuffer->writeString(line2, Common::Point(xp + 2, 0), BLACK);
- _textBuffer->writeString(line2, Common::Point(xp + 0, 1), BLACK);
- _textBuffer->writeString(line2, Common::Point(xp + 2, 1), BLACK);
- _textBuffer->writeString(line2, Common::Point(xp + 0, 2), BLACK);
- _textBuffer->writeString(line2, Common::Point(xp + 1, 2), BLACK);
- _textBuffer->writeString(line2, Common::Point(xp + 2, 2), BLACK);
- _textBuffer->writeString(line2, Common::Point(xp + 1, 1), MAP_NAME_COLOR);
+ _textBuffer->writeString(line2, Common::Point(xp + 0, yp), BLACK);
+ _textBuffer->writeString(line2, Common::Point(xp + 1, yp), BLACK);
+ _textBuffer->writeString(line2, Common::Point(xp + 2, yp), BLACK);
+ _textBuffer->writeString(line2, Common::Point(xp + 0, yp + 1), BLACK);
+ _textBuffer->writeString(line2, Common::Point(xp + 2, yp + 1), BLACK);
+ _textBuffer->writeString(line2, Common::Point(xp + 0, yp + 2), BLACK);
+ _textBuffer->writeString(line2, Common::Point(xp + 1, yp + 2), BLACK);
+ _textBuffer->writeString(line2, Common::Point(xp + 2, yp + 2), BLACK);
+ _textBuffer->writeString(line2, Common::Point(xp + 1, yp + 1), MAP_NAME_COLOR);
}
// Set the text display position