[Scummvm-cvs-logs] scummvm master -> 90802cedbc8a75ec6c6bf297f01fb357ab5fcb03

[dreammaster]

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:
90802cedbc SHERLOCK: RT: Fix saving so Watson's walk sequences can be set on loading


Commit: 90802cedbc8a75ec6c6bf297f01fb357ab5fcb03
    https://github.com/scummvm/scummvm/commit/90802cedbc8a75ec6c6bf297f01fb357ab5fcb03
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-31T20:07:03-04:00

Commit Message:
SHERLOCK: RT: Fix saving so Watson's walk sequences can be set on loading

Changed paths:
    engines/sherlock/tattoo/tattoo_people.cpp



diff --git a/engines/sherlock/tattoo/tattoo_people.cpp b/engines/sherlock/tattoo/tattoo_people.cpp
index 94a4078..cc5872e 100644
--- a/engines/sherlock/tattoo/tattoo_people.cpp
+++ b/engines/sherlock/tattoo/tattoo_people.cpp
@@ -971,7 +971,14 @@ void TattooPerson::synchronize(Serializer &s) {
 	s.syncAsSint32LE(_position.x);
 	s.syncAsSint32LE(_position.y);
 	s.syncAsSint16LE(_sequenceNumber);
-	s.syncAsSint16LE(_type);
+
+	if (s.isSaving()) {
+		SpriteType type = (_type == INVALID && _walkLoaded) ? HIDDEN_CHARACTER : _type;
+		s.syncAsSint16LE(type);
+	} else {
+		s.syncAsSint16LE(_type);
+	}
+
 	s.syncString(_walkVGSName);
 	s.syncString(_description);
 	s.syncString(_examine);