[Scummvm-cvs-logs] scummvm master -> 5e3b9c8f690239318b5cd2c58916aab302781f03

dreammaster dreammaster at scummvm.org
Sat Jun 6 04:44:59 CEST 2015


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

Summary:
71604c3a46 SHERLOCK: Fix initialization and syncing of map _overPos
5e3b9c8f69 SHERLOCK: Don't reset map position when changing RT scene


Commit: 71604c3a46a427f858a0697ad1e75667a41ac503
    https://github.com/scummvm/scummvm/commit/71604c3a46a427f858a0697ad1e75667a41ac503
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-05T22:41:53-04:00

Commit Message:
SHERLOCK: Fix initialization and syncing of map _overPos

This won't affect existing savegames, since we don't allow saving when
the map is active anyway. This is just in case we ever allow it.

Changed paths:
    engines/sherlock/map.cpp



diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp
index dfc9798..9c6818a 100644
--- a/engines/sherlock/map.cpp
+++ b/engines/sherlock/map.cpp
@@ -60,7 +60,7 @@ Map::Map(SherlockEngine *vm): _vm(vm), _topLine(g_system->getWidth(), 12) {
 	_placesShown = false;
 	_cursorIndex = -1;
 	_drawMap = false;
-	_overPos = Common::Point(13000, 12600);
+	_overPos = Point32(130 * FIXED_INT_MULTIPLIER, 126 * FIXED_INT_MULTIPLIER);
 	_charPoint = 0;
 	_oldCharPoint = 0;
 	_frameChangeFlag = false;
@@ -557,8 +557,15 @@ void Map::highlightIcon(const Common::Point &pt) {
 void Map::synchronize(Common::Serializer &s) {
 	s.syncAsSint16LE(_bigPos.x);
 	s.syncAsSint16LE(_bigPos.y);
-	s.syncAsSint16LE(_overPos.x);
-	s.syncAsSint16LE(_overPos.y);
+
+	Point32 overPos(_overPos.x / FIXED_INT_MULTIPLIER, _overPos.y / FIXED_INT_MULTIPLIER);
+	s.syncAsSint16LE(overPos.x);
+	s.syncAsSint16LE(overPos.y);
+	if (s.isLoading()) {
+		_overPos.x = overPos.x * FIXED_INT_MULTIPLIER;
+		_overPos.y = overPos.y * FIXED_INT_MULTIPLIER;
+	}
+
 	s.syncAsSint16LE(_oldCharPoint);
 }
 


Commit: 5e3b9c8f690239318b5cd2c58916aab302781f03
    https://github.com/scummvm/scummvm/commit/5e3b9c8f690239318b5cd2c58916aab302781f03
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-05T22:43:54-04:00

Commit Message:
SHERLOCK: Don't reset map position when changing RT scene

Changed paths:
    engines/sherlock/objects.cpp



diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 1cfde29..881fd74 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -1194,9 +1194,9 @@ int Object::checkNameForCodes(const Common::String &name, const char *const mess
 			if (ch >= '0' && ch <= '9') {
 				scene._goToScene = atoi(name.c_str() + 1);
 
-				if (scene._goToScene < 97 && map[scene._goToScene].x) {
-					map._overPos.x = map[scene._goToScene].x * 100 - 600;
-					map._overPos.y = map[scene._goToScene].y * 100 + 900;
+				if (IS_SERRATED_SCALPEL && scene._goToScene < 97 && map[scene._goToScene].x) {
+					map._overPos.x = (map[scene._goToScene].x - 6) * FIXED_INT_MULTIPLIER;
+					map._overPos.y = (map[scene._goToScene].y + 9) * FIXED_INT_MULTIPLIER;
 				}
 
 				const char *p;






More information about the Scummvm-git-logs mailing list