[Scummvm-cvs-logs] scummvm master -> 6bc2a633a2921d589f8226160d19243a9ee99699

dreammaster dreammaster at scummvm.org
Tue Jul 7 14:20:39 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:
6bc2a633a2 SHERLOCK: RT: Fix Valgrind issues


Commit: 6bc2a633a2921d589f8226160d19243a9ee99699
    https://github.com/scummvm/scummvm/commit/6bc2a633a2921d589f8226160d19243a9ee99699
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-07T08:19:39-04:00

Commit Message:
SHERLOCK: RT: Fix Valgrind issues

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



diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 46ae8e7..1e19dcc 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -185,11 +185,11 @@ void People::reset() {
 
 		if (IS_SERRATED_SCALPEL) {
 			p._type = CHARACTER;
-			p._sequenceNumber = Tattoo::STOP_DOWNRIGHT;
+			p._sequenceNumber = (int)Tattoo::STOP_DOWNRIGHT;
 			p._position = Point32(100 * FIXED_INT_MULTIPLIER, 110 * FIXED_INT_MULTIPLIER);
 		} else if (!talk._scriptMoreFlag && !saves._justLoaded) {
 			p._type = (idx == 0) ? CHARACTER : INVALID;
-			p._sequenceNumber = Scalpel::STOP_DOWNRIGHT;
+			p._sequenceNumber = (int)Scalpel::STOP_DOWNRIGHT;
 			p._position = Point32(36 * FIXED_INT_MULTIPLIER, 29 * FIXED_INT_MULTIPLIER);
 			p._use[0]._verb = "";
 			p._use[1]._verb = "";
diff --git a/engines/sherlock/tattoo/tattoo_people.cpp b/engines/sherlock/tattoo/tattoo_people.cpp
index 81f68b4..d89a2e7 100644
--- a/engines/sherlock/tattoo/tattoo_people.cpp
+++ b/engines/sherlock/tattoo/tattoo_people.cpp
@@ -988,7 +988,7 @@ void TattooPerson::synchronize(Serializer &s) {
 	s.syncAsUint16LE(count);
 	if (s.isLoading()) {
 		// Load path
-		for (uint idx = 0; idx < count; ++count) {
+		for (uint idx = 0; idx < count; ++idx) {
 			int xp = 0, yp = 0;
 			s.syncAsSint16LE(xp);
 			s.syncAsSint16LE(yp);






More information about the Scummvm-git-logs mailing list