diff options
| author | Torbjörn Andersson | 2015-06-14 22:59:50 +0200 |
|---|---|---|
| committer | Torbjörn Andersson | 2015-06-14 22:59:50 +0200 |
| commit | 8429adcb5109fb7334cb96560abe051b72b28044 (patch) | |
| tree | 9c9e168fa5db1055c4b023d7719b610246a37aa1 /engines | |
| parent | 84c548dcbc85ec528f1c7543653e5f5495876295 (diff) | |
| download | scummvm-rg350-8429adcb5109fb7334cb96560abe051b72b28044.tar.gz scummvm-rg350-8429adcb5109fb7334cb96560abe051b72b28044.tar.bz2 scummvm-rg350-8429adcb5109fb7334cb96560abe051b72b28044.zip | |
SHERLOCK: Silence two other GCC warnings
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sherlock/people.cpp | 2 | ||||
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_people.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp index 7306ae96d0..b3ae135b40 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 80f2484c6b..30a87ce7e0 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; } |