[Scummvm-cvs-logs] scummvm master -> 8429adcb5109fb7334cb96560abe051b72b28044

[eriktorbjorn]

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:
8429adcb51 SHERLOCK: Silence two other GCC warnings


Commit: 8429adcb5109fb7334cb96560abe051b72b28044
    https://github.com/scummvm/scummvm/commit/8429adcb5109fb7334cb96560abe051b72b28044
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-06-14T22:59:50+02:00

Commit Message:
SHERLOCK: Silence two other GCC warnings

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 7306ae9..b3ae135 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -239,7 +239,7 @@ void People::reset() {
 		else
 			p._position = Point32(36 * FIXED_INT_MULTIPLIER, 29 * FIXED_INT_MULTIPLIER);
 
-		p._sequenceNumber = IS_SERRATED_SCALPEL ? Scalpel::STOP_DOWNRIGHT : Tattoo::STOP_DOWNRIGHT;
+		p._sequenceNumber = IS_SERRATED_SCALPEL ? (int)Scalpel::STOP_DOWNRIGHT : (int)Tattoo::STOP_DOWNRIGHT;
 		p._imageFrame = nullptr;
 		p._frameNumber = 1;
 		p._delta = Point32(0, 0);
diff --git a/engines/sherlock/tattoo/tattoo_people.cpp b/engines/sherlock/tattoo/tattoo_people.cpp
index 80f2484..30a87ce 100644
--- a/engines/sherlock/tattoo/tattoo_people.cpp
+++ b/engines/sherlock/tattoo/tattoo_people.cpp
@@ -346,7 +346,7 @@ void TattooPerson::setWalking() {
 			else
 				dir = (delta.y < 0) ? WALK_UP : WALK_DOWN;
 
-			int scaleVal = scene.getScaleVal(Point32(_walkDest.x * FIXED_INT_MULTIPLIER,
+			scaleVal = scene.getScaleVal(Point32(_walkDest.x * FIXED_INT_MULTIPLIER,
 				_walkDest.y * FIXED_INT_MULTIPLIER));
 			_walkDest.x -= _stopFrames[dir]->sDrawXSize(scaleVal) / 2;
 		}