[Scummvm-cvs-logs] scummvm master -> da3e0de1f90709f30663c691b1df7a2c9e9fe875

dreammaster dreammaster at scummvm.org
Sun Jun 14 23:04:36 CEST 2015


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
da3e0de1f9 SHERLOCK: RT: Fix rendering name surface on map


Commit: da3e0de1f90709f30663c691b1df7a2c9e9fe875
    https://github.com/scummvm/scummvm/commit/da3e0de1f90709f30663c691b1df7a2c9e9fe875
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-14T17:03:33-04:00

Commit Message:
SHERLOCK: RT: Fix rendering name surface on map

Changed paths:
    engines/sherlock/scene.cpp
    engines/sherlock/tattoo/tattoo_map.cpp



diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 32da61a..3f19447 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 d887217..7283428 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






More information about the Scummvm-git-logs mailing list